Merge "Fix a bug where cache was double-counted." into oc-dev am: 7035a41715
am: 0a8b12a30a

Change-Id: I3f17e10a9aaf011aee587dbe0e36d18a3a27c42f