Fix cache key issue