Fix Caching of Query Cached Stores