Revert "[Fix extra data in cache]"

This reverts commit a666d74d4bc7e1298314c516d1309571fb87c212.

Bug: 27314050
Change-Id: I1562c51751f983a49a11e1d37d936974e17388ef
1 file changed