Revert "Merge branch 'feature/cache-object-file'"

This reverts commit aad1e1ac1e4ebc0969f21286ac3e5d37c5b8a1b0, reversing
changes made to 94e9a8a0cb9bdb8cfc63550f000abcc47e846e51.