WIP cache refactor

Change-Id: Iafc5723143ab9f175d60d13208c55df55d1ab71d
2 files changed