diff --git a/lib/cache.py b/lib/cache.py
index 3317cb7..fe257eb 100644
--- a/lib/cache.py
+++ b/lib/cache.py
@@ -41,6 +41,10 @@ def get_signature(user_agent, query_string, client_ip_address, lang):
         location = query_string.split("?", 1)[0]
     else:
         location = query_string
+    if location.startswith("http://"):
+        location = location[7:]
+    elif location.startswith("https://"):
+        location = location[8:]
     if ":" in location:
         return None
 
@@ -81,7 +85,7 @@ def store(signature, value):
     Store in cache `value` for `signature`
     """
     if not signature:
-        return value
+        return _update_answer(value)
 
     if len(value) >= MIN_SIZE_FOR_FILECACHE:
         value_to_store = _store_in_file(signature, value)