Add user and project to the cache key
Add user and project to the cache key