[automerger skipped] Fix caching interface according to vendor feedback. am: ed0822bc78 am: 2688f8fbfb
am: a8c6a9c87c -s ours
am skip reason: change_id I921b7b8ccc3c66af19f6589f7213c6870d6f07bf with SHA1 b61ba1ed0b is in history

Change-Id: I3067372c437a1df7600f0a2e8fcd2ef54e97647f