Merge "Fix a cache calculation regression." into oc-mr1-dev