Merge "Fix Store caching"