diff --git a/AUTHORS b/AUTHORS
index f45dad3365..4819364eb3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -237,6 +237,7 @@ answer newbie questions, and generally made Django that much better:
     Vasiliy Stavenko <stavenko@gmail.com>
     Thomas Steinacher <http://www.eggdrop.ch/>
     nowell strite
+    Sundance
     Radek Švarz <http://www.svarz.cz/translate/>
     Swaroop C H <http://www.swaroopch.info>
     Aaron Swartz <http://www.aaronsw.com/>
diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py
index 0e21b80ed8..468d1e629b 100644
--- a/django/core/cache/backends/locmem.py
+++ b/django/core/cache/backends/locmem.py
@@ -2,7 +2,11 @@
 
 from django.core.cache.backends.simple import CacheClass as SimpleCacheClass
 from django.utils.synch import RWLock
-import copy, time
+import time
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
 
 class CacheClass(SimpleCacheClass):
     def __init__(self, host, params):
@@ -20,7 +24,10 @@ class CacheClass(SimpleCacheClass):
             elif exp < now:
                 should_delete = True
             else:
-                return copy.deepcopy(self._cache[key])
+                try:
+                    return pickle.loads(self._cache[key])
+                except pickle.PickleError:
+                    return default
         finally:
             self._lock.reader_leaves()
         if should_delete:
@@ -35,7 +42,10 @@ class CacheClass(SimpleCacheClass):
     def set(self, key, value, timeout=None):
         self._lock.writer_enters()
         try:
-            SimpleCacheClass.set(self, key, value, timeout)
+            try:
+                super(CacheClass, self).set(key, pickle.dumps(value), timeout)
+            except pickle.PickleError:
+                pass
         finally:
             self._lock.writer_leaves()
 
diff --git a/tests/regressiontests/cache/tests.py b/tests/regressiontests/cache/tests.py
index 9dc7161c03..0a5185e86e 100644
--- a/tests/regressiontests/cache/tests.py
+++ b/tests/regressiontests/cache/tests.py
@@ -4,7 +4,7 @@
 from django.core.cache import cache
 import time, unittest
 
-# functions/classes for complex data type tests        
+# functions/classes for complex data type tests
 def f():
     return 42
 class C:
@@ -46,13 +46,12 @@ class Cache(unittest.TestCase):
         self.assertEqual(cache.has_key("hello"), True)
         self.assertEqual(cache.has_key("goodbye"), False)
 
-    def test_in(self): 
-        cache.set("hello", "goodbye") 
-        self.assertEqual("hello" in cache, True) 
-        self.assertEqual("goodbye" in cache, False) 
+    def test_in(self):
+        cache.set("hello", "goodbye")
+        self.assertEqual("hello" in cache, True)
+        self.assertEqual("goodbye" in cache, False)
 
     def test_data_types(self):
-        # test data types
         stuff = {
             'string'    : 'this is a string',
             'int'       : 42,
@@ -61,11 +60,12 @@ class Cache(unittest.TestCase):
             'dict'      : {'A': 1, 'B' : 2},
             'function'  : f,
             'class'     : C,
+            'iter'      : iter([1, 2 ,3]),
         }
         for (key, value) in stuff.items():
             cache.set(key, value)
             self.assertEqual(cache.get(key), value)
-    
+
     def test_expiration(self):
         # expiration
         cache.set('expire', 'very quickly', 1)