Fix in memory cache