Merge pull request #2944 from jsternberg/cache-ref-only-format-fix

Merge pull request #2944 from jsternberg/cache-ref-only-format-fix #4480