Fix for cache