diff --git a/core/core.services.yml b/core/core.services.yml
index ee13e34..d91c5f0 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -181,6 +181,10 @@ services:
     arguments: [ '%container.namespaces%' ]
     tags:
       - { name: persist }
+  container.trait:
+    abstract: true
+    calls:
+      - [setContainer, ['@service_container']]
   default_plugin_manager:
     abstract: true
     arguments: ['@container.namespaces', '@cache.default', '@language_manager', '@module_handler']
@@ -193,8 +197,7 @@ services:
   entity.manager:
     class: Drupal\Core\Entity\EntityManager
     arguments: ['@container.namespaces', '@module_handler', '@cache.default', '@language_manager', '@string_translation']
-    calls:
-      - [setContainer, ['@service_container']]
+    parent: container.trait
     tags:
       - { name: plugin_manager_cache_clear }
   entity.form_builder:
@@ -239,16 +242,14 @@ services:
     arguments: ['@service_container']
   controller_resolver:
     class: Drupal\Core\Controller\ControllerResolver
-    calls:
-      - [setContainer, ['@service_container']]
+    parent: container.trait
   title_resolver:
     class: Drupal\Core\Controller\TitleResolver
     arguments: ['@controller_resolver', '@string_translation']
   http_kernel:
     class: Drupal\Core\HttpKernel
     arguments: ['@event_dispatcher', '@controller_resolver', '@request_stack']
-    calls:
-      - [setContainer, ['@service_container']]
+    parent: container.trait
   language_manager:
     class: Drupal\Core\Language\LanguageManager
     arguments: ['@language.default']
@@ -436,8 +437,7 @@ services:
   route_content_form_controller_subscriber:
     class: Drupal\Core\EventSubscriber\ContentFormControllerSubscriber
     arguments: ['@controller_resolver', '@form_builder']
-    calls:
-      - [setContainer, ['@service_container']]
+    parent: container.trait
     tags:
       - { name: event_subscriber }
   route_special_attributes_subscriber: