diff --git a/pre-upload.py b/pre-upload.py
index 167eeaa..b2f4923 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -2265,8 +2265,7 @@
 
         # Require people to set specific values all the time.
         settings = (
-            # TODO: Enable this for everyone.  http://crbug.com/408038
-            # ('fast caching', 'cache-format = md5-dict'),
+            ('fast caching', 'cache-format = md5-dict'),
             ("fast manifests", "thin-manifests = true"),
             (
                 "extra features",
diff --git a/pre-upload_unittest.py b/pre-upload_unittest.py
index 5e0655a..6b4f784 100755
--- a/pre-upload_unittest.py
+++ b/pre-upload_unittest.py
@@ -1838,6 +1838,7 @@
     def GetLayoutConf(self, filters=()):
         """Return a valid layout.conf with |filters| lines removed."""
         all_lines = [
+            "cache-format = md5-dict",
             "masters = portage-stable chromiumos",  # nocheck
             "profile-formats = portage-2 profile-default-eapi",
             "profile_eapi_when_unspecified = 5-progress",