Improve this cache key too