Revert "WIP Feature: Cache"

This reverts commit 8f8b04832824e4375162b0721e285c738a5139d1.

Change-Id: I47774c0bdc313c5a82235d6a7750eb3df35ddcd0
Merge "Revert "WIP Feature: Cache""