Cache key fix