Removed extra PropertyStoreCacheState