Add ability to cache by query string