Fix cache key
Fix cache key