diff --git a/lib/sparql/client/cache.rb b/lib/sparql/client/cache.rb
index 8ba3b0e1..123ae827 100644
--- a/lib/sparql/client/cache.rb
+++ b/lib/sparql/client/cache.rb
@@ -19,7 +19,7 @@ def invalidate(graphs)
     end
 
     def key(query, options)
-      generate_cache_key(query, options)
+      query_cache_key(query, options)
     end
 
     def self.generate_cache_key(string, from)
@@ -78,9 +78,9 @@ def cache_key(query)
       SPARQL::Client::Cache.generate_cache_key(query.to_s, from)
     end
 
-    def generate_cache_key(query, options)
+    def query_cache_key(query, options)
       if options[:graphs] || query.options[:graphs]
-        cache_key = SPARQL::Client::Query.generate_cache_key(query.to_s, options[:graphs] || query.options[:graphs])
+        cache_key = SPARQL::Client::Cache.generate_cache_key(query.to_s, options[:graphs] || query.options[:graphs])
       else
         cache_key = cache_key(query)
       end
@@ -92,7 +92,7 @@ def cached_query_response(query, options)
 
       if @redis_cache && (query.instance_of?(SPARQL::Client::Query) || options[:graphs])
 
-        cache_key = generate_cache_key(query, options)
+        cache_key = query_cache_key(query, options)
         cache_response = @redis_cache.get(cache_key[:query])
 
         if options[:reload_cache] and options[:reload_cache] == true