Removed unnecessary code in CacheKey, CacheOptions, CacheScope

Added revisioning to query keys