From 9ce605221a5dc1e43f65c57d80046cc995a34c69 Mon Sep 17 00:00:00 2001
From: amitlicht <amitlicht@gmail.com>
Date: Sun, 28 Jun 2015 17:53:20 +0300
Subject: [PATCH 1/3] Suggested fix for #1047: CachedReferenceField creates
 DBRef on to_python, but can't save them on to_mongo. Dereferencing DBRef to
 document type before returning it from to_python.

---
 mongoengine/fields.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index bc16d1b6..63c708b2 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1034,6 +1034,7 @@ class CachedReferenceField(BaseField):
             collection = self.document_type._get_collection_name()
             value = DBRef(
                 collection, self.document_type.id.to_python(value['_id']))
+            return self.document_type._from_son(self.document_type._get_db().dereference(value))
 
         return value
 

From d7a2ccf5ac35007378b6960653159193138f7f24 Mon Sep 17 00:00:00 2001
From: amitlicht <amitlicht@gmail.com>
Date: Tue, 30 Jun 2015 15:03:06 +0300
Subject: [PATCH 2/3] Adding a test case for #1047.

---
 tests/fields/fields.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 011a54d4..a772de6d 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1617,6 +1617,27 @@ class FieldTest(unittest.TestCase):
                                'parent': "50a234ea469ac1eda42d347d"})
         mongoed = p1.to_mongo()
         self.assertTrue(isinstance(mongoed['parent'], ObjectId))
+        
+    def test_cached_reference_field_get_and_save(self):
+        """
+        Tests #1047: CachedReferenceField creates DBRefs on to_python, but can't save them on to_mongo
+        """
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(Animal)
+        
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
+        
+        Ocorrence(person="testte", 
+                  animal=Animal(name="Leopard", tag="heavy").save()).save()
+        p = Ocorrence.objects.get()
+        p.person = 'new_testte'
+        p.save()
 
     def test_cached_reference_fields(self):
         class Animal(Document):

From 6f16d35a9245f6edef8b8007df3beb34ceb01e02 Mon Sep 17 00:00:00 2001
From: amitlicht <amitlicht@gmail.com>
Date: Tue, 30 Jun 2015 15:08:20 +0300
Subject: [PATCH 3/3] Adding a changelog line & adding myself to AUTHORS.

---
 AUTHORS            | 1 +
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index b0400f4d..a66bf7c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -227,3 +227,4 @@ that much better:
  * Breeze.Kay (https://github.com/9nix00)
  * Vicki Donchenko (https://github.com/kivistein)
  * Emile Caron (https://github.com/emilecaron)
+ * Amit Lichtenberg (https://github.com/amitlicht)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index de47000d..d521c010 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.10.1 - DEV
 =======================
 - Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
+- Fix CachedReferenceField bug when loading cached docs as DBRef but failing to save them. #1047
 
 Changes in 0.10.0
 =================