diff --git a/key.install b/key.install
index f61a25d..1ecca25 100644
--- a/key.install
+++ b/key.install
@@ -79,3 +79,10 @@ function key_update_8002() {
     return t('Key configuration overrides updated.');
   }
 }
+
+/**
+ * Clear caches to fix circular dependencies errors.
+ */
+function key_update_8101() {
+  // Empty update to cause a cache flush.
+}
diff --git a/key.services.yml b/key.services.yml
index 4ad5204..9261718 100644
--- a/key.services.yml
+++ b/key.services.yml
@@ -12,7 +12,6 @@ services:
     class: Drupal\key\Plugin\KeyPluginManager
     arguments: ['key_input', '@container.namespaces', '@cache.discovery', '@module_handler']
   key.config_override:
-    class: \Drupal\key\KeyConfigOverrides
-    arguments: ['@config.factory', '@cache.data', '@key.repository']
-    tags:
-      - {name: config.factory.override, priority: 10}
+      class: \Drupal\key\KeyConfigOverrides
+      tags:
+        - {name: config.factory.override, priority: 10}
diff --git a/src/KeyConfigOverrides.php b/src/KeyConfigOverrides.php
index ee36897..96334a5 100644
--- a/src/KeyConfigOverrides.php
+++ b/src/KeyConfigOverrides.php
@@ -4,8 +4,6 @@ namespace Drupal\key;
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
 
@@ -14,21 +12,6 @@ use Drupal\Core\Config\StorageInterface;
  */
 class KeyConfigOverrides implements ConfigFactoryOverrideInterface {
 
-  /**
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cacheBackend;
-
-  /**
-   * @var \Drupal\key\KeyRepositoryInterface
-   */
-  protected $keyRepository;
-
   /**
    * @var array
    */
@@ -39,19 +22,6 @@ class KeyConfigOverrides implements ConfigFactoryOverrideInterface {
    */
   protected $inOverride = FALSE;
 
-  /**
-   * Creates a new ModuleConfigOverrides instance.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface|null $config_factory
-   * @param \Drupal\Core\Cache\CacheBackendInterface|null $cache_backend
-   * @param \Drupal\key\KeyRepositoryInterface|null $key_repository
-   */
-  public function __construct(ConfigFactoryInterface $config_factory = NULL, CacheBackendInterface $cache_backend = NULL, KeyRepositoryInterface $key_repository = NULL) {
-    $this->configFactory = $config_factory ?: \Drupal::configFactory();
-    $this->cacheBackend = $cache_backend ?: \Drupal::cache('data');
-    $this->keyRepository = $key_repository ?: \Drupal::service('key.repository');
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -76,7 +46,7 @@ class KeyConfigOverrides implements ConfigFactoryOverrideInterface {
       $override = [];
 
       foreach ($mapping[$name] as $config_item => $key_id) {
-        $key_value = $this->keyRepository->getKey($key_id)->getKeyValue();
+        $key_value = \Drupal::service('key.repository')->getKey($key_id)->getKeyValue();
 
         if (!isset($key_value)) {
           continue;
@@ -130,8 +100,9 @@ class KeyConfigOverrides implements ConfigFactoryOverrideInterface {
   protected function getMapping() {
     if (!$this->mapping) {
       $mapping = [];
-      $override_ids = $this->configFactory->listAll('key.config_override.');
-      $overrides = $this->configFactory->loadMultiple($override_ids);
+      $config_factory = \Drupal::configFactory();
+      $override_ids = $config_factory->listAll('key.config_override.');
+      $overrides = $config_factory->loadMultiple($override_ids);
 
       foreach ($overrides as $id => $override) {
         $override = $override->get();