diff --git a/profile2.module b/profile2.module
index 691e68d..4bee41c 100644
--- a/profile2.module
+++ b/profile2.module
@@ -726,12 +726,12 @@ class Profile extends Entity {
     }
     $this->changed = REQUEST_TIME;
 
-    parent::save();
-    // Update the static cache from profile2_load_by_user().
+    // Clear the static cache from profile2_load_by_user() before saving, so
+    // that profiles are correctly loaded in insert/update hooks.
     $cache = &drupal_static('profile2_load_by_user', array());
-    if (isset($cache[$this->uid])) {
-      $cache[$this->uid][$this->type] = $this->pid;
-    }
+    unset($cache[$this->uid]);
+
+    parent::save();
   }
 }
 
