diff --git a/_build/data/transport.core.system_settings.php b/_build/data/transport.core.system_settings.php
index 47ffc186c76..02465030c81 100644
--- a/_build/data/transport.core.system_settings.php
+++ b/_build/data/transport.core.system_settings.php
@@ -227,15 +227,6 @@
   'area' => 'caching',
   'editedon' => null,
 ], '', true, true);
-$settings['cache_format'] = $xpdo->newObject(modSystemSetting::class);
-$settings['cache_format']->fromArray([
-  'key' => 'cache_format',
-  'value' => 0,
-  'xtype' => 'numberfield',
-  'namespace' => 'core',
-  'area' => 'caching',
-  'editedon' => null,
-], '', true, true);
 $settings['cache_handler'] = $xpdo->newObject(modSystemSetting::class);
 $settings['cache_handler']->fromArray([
   'key' => 'cache_handler',
diff --git a/setup/includes/upgrades/common/3.3.0-remove-cache-format.php b/setup/includes/upgrades/common/3.3.0-remove-cache-format.php
new file mode 100644
index 00000000000..96f37750acf
--- /dev/null
+++ b/setup/includes/upgrades/common/3.3.0-remove-cache-format.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Remove cache_format from system settings.
+ *
+ * Changing this setting in the manager crashes the site: system settings are
+ * loaded from cache, so a new format cannot read the old cache files. Override
+ * via $config_options['cache_format'] in core/config/config.inc.php instead
+ * (and clear the cache directory when changing it).
+ *
+ * @var modX $modx
+ * @package setup
+ */
+
+use MODX\Revolution\modSystemSetting;
+
+$modx->removeObject(modSystemSetting::class, ['key' => 'cache_format']);
diff --git a/setup/includes/upgrades/mysql/3.3.0-pl.php b/setup/includes/upgrades/mysql/3.3.0-pl.php
new file mode 100644
index 00000000000..baac86cc42e
--- /dev/null
+++ b/setup/includes/upgrades/mysql/3.3.0-pl.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Specific upgrades for Revolution 3.3.0-pl
+ *
+ * @var modX $modx
+ * @package setup
+ * @subpackage upgrades
+ */
+
+/* run upgrades common to all db platforms */
+include dirname(__DIR__) . '/common/3.3.0-remove-cache-format.php';