Merge "Fix a bug where cache was double-counted." into oc-dev