diff --git a/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php b/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php
index 7fee680def..b4c8dc6a45 100644
--- a/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php
+++ b/src/applications/people/cache/PhabricatorUserPreferencesCacheType.php
@@ -5,7 +5,7 @@ final class PhabricatorUserPreferencesCacheType
 
   const CACHETYPE = 'preferences';
 
-  const KEY_PREFERENCES = 'user.preferences.v1';
+  const KEY_PREFERENCES = 'user.preferences.v2';
 
   public function getAutoloadKeys() {
     return array(
@@ -47,6 +47,16 @@ final class PhabricatorUserPreferencesCacheType
       foreach ($all_settings as $key => $setting) {
         $value = $preference->getSettingValue($key);
 
+        try {
+          id(clone $setting)
+            ->setViewer($viewer)
+            ->assertValidValue($value);
+        } catch (Exception $ex) {
+          // If the saved value isn't valid, don't cache it: we'll use the
+          // default value instead.
+          continue;
+        }
+
         // As an optimization, we omit the value from the cache if it is
         // exactly the same as the hardcoded default.
         $default_value = id(clone $setting)