diff --git a/classes/model.php b/classes/model.php
index 686f0c94f..7865f14a8 100644
--- a/classes/model.php
+++ b/classes/model.php
@@ -1353,8 +1353,6 @@ public function save($cascade = null, $use_transaction = false)
 			}
 			$this->unfreeze();
 
-			$this->_update_original();
-
 			$this->observe('after_save');
 
 			$use_transaction and $db->commit_transaction();
@@ -1462,6 +1460,9 @@ protected function update()
 			return false;
 		}
 
+		$this->_original = $this->_data;
+		static::$_cached_objects[get_class($this)][static::implode_pk($this)] = $this;
+
 		// update the original property on success
 		$this->observe('after_update');