ModelStoreCache now working