Fix Store caching

Bug: 4671090
Change-Id: I07413eb713c564f6dbcac45091357153cfe19a5d
2 files changed