Fix for cache key lookup