Refactor the page cache plugin

plugins/system/cache/cache.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension type="plugin" group="system" method="upgrade">
+<extension version="4.0.0" type="plugin" group="system" method="upgrade">
 	<name>plg_system_cache</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2007</creationDate>
@@ -9,8 +9,10 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
 	<description>PLG_CACHE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\System\Cache</namespace>
 	<files>
-		<filename plugin="cache">cache.php</filename>
+		<folder plugin="cache">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_system_cache.ini</language>

plugins/system/cache/services/provider.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  System.cache
+ *
+ * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\System\Cache\Extension\Cache;
+
+return new class implements ServiceProviderInterface {
+	/**
+	 * Registers the service provider with a DI container.
+	 *
+	 * @param   Container  $container  The DI container.
+	 *
+	 * @return  void
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function register(Container $container)
+	{
+		$container->set(
+			PluginInterface::class,
+			function (Container $container)
+			{
+				$plugin     = PluginHelper::getPlugin('system', 'cache');
+				$dispatcher = $container->get(DispatcherInterface::class);
+
+				return new Cache($dispatcher, (array) $plugin);
+			}
+		);
+	}
+};