Revert "Revert "Staging: zcache: Squash upstream changes.""

This reverts commit 0dc89847257fd41a4ae29336cb2a56ecc5d85f9d.