Change the way cache key is generated - Imrpoves caching by including the query parameters that makes the cache key unique per request