Revert "Staging: zcache: Squash upstream changes."

This reverts commit b0f348a6a69af939acf0b6e3cf208dad8eeaa38b.