Merge "Cache storage values for fast loading." into oc-mr1-dev