Merge fix for cache keys

Author: janfabry

keyvaluestore/managers.py

@@ -7,12 +7,13 @@
 class KeyValueStoreManager(models.Manager):
     def get_value_for_key(self, key):
         key = key.upper()
-        cached = cache.get(key)
+        cached_key = 'kvs_%s' % (key,)
+        cached = cache.get(cached_key)
 
         if not cached:
             try:
-                obj = self.get(key=key)
-                cache.set('kvs_%s' % (key,), obj.value)
+                obj = self.get(key=cached_key)
+                cache.set(cached_key, obj.value)
 
                 return obj.value
             except:

keyvaluestore/models.py

@@ -20,8 +20,11 @@ def __unicode__(self):
     def save(self, *args, **kwargs):
         self.key = self.key.upper()
 
-        key = 'kvs_%s' % (self.key,)
-        cache.delete(self.key)
-        cache.set(self.key, self.value)
+        cache.delete(self.cached_key)
+        cache.set(self.cached_key, self.value)
 
         super(KeyValueStore, self).save(*args, **kwargs)
+
+    @property
+    def cached_key(self):
+        return 'kvs_%s' % (self.key,)