Fix caching interface according to vendor feedback. am: ed0822bc78
am: 2688f8fbfb

Change-Id: I2570eee9de88f62025805c9666619592e7f872c7