Fix caching interface according to vendor feedback.
am: ed0822bc78

Change-Id: I239c9b30560a965610c89ad01e2c80c4553b1166