Improve cache key