diff --git a/lib/SimpleSAML/MemcacheStore.php b/lib/SimpleSAML/MemcacheStore.php
index 7ae8e9299e6d9aa74b2b7d7fe0eccf965176b4ac..74d4d13c885254cee268726a4eab64067647166e 100644
--- a/lib/SimpleSAML/MemcacheStore.php
+++ b/lib/SimpleSAML/MemcacheStore.php
@@ -149,6 +149,9 @@ class SimpleSAML_MemcacheStore {
 			$latest->savedData = $latestSerializedValue;
 		}
 
+		/* Add a call to save the data when we exit. */
+		register_shutdown_function(array($latest, 'save'));
+
 		return $latest;
 	}