diff --git a/phpBB/common.php b/phpBB/common.php
index 591969df74..0446b5c15e 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -142,5 +142,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = new phpbb_cron_manager(new phpbb_cron_task_provider($phpbb_extension_manager), $cache->get_driver());
+	$cron = $container->get('cron.manager');
 }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 09eb993ca6..85a230de52 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -80,3 +80,14 @@ services:
         arguments:
             - @dispatcher
             - @ext.manager
+
+    cron.task_provider:
+        class: phpbb_cron_task_provider
+        arguments:
+            - @ext.manager
+
+    cron.manager:
+        class: phpbb_cron_manager
+        arguments:
+            - @cron.task_provider
+            - @cache.driver