diff --git a/src/fn/DI/Container.php b/src/fn/DI/Container.php
index <HASH>..<HASH> 100644
--- a/src/fn/DI/Container.php
+++ b/src/fn/DI/Container.php
@@ -32,6 +32,8 @@ class Container extends \DI\Container implements MutableDefinitionSource
             );
         }
         parent::__construct($this->definitionSource = $definitionSource, $proxyFactory, $wrapperContainer);
+        $this->resolvedEntries[self::class]   = $this;
+        $this->resolvedEntries[static::class] = $this;
     }
 
     /**
diff --git a/tests/fixtures/extra-empty/test.php b/tests/fixtures/extra-empty/test.php
index <HASH>..<HASH> 100644
--- a/tests/fixtures/extra-empty/test.php
+++ b/tests/fixtures/extra-empty/test.php
@@ -5,6 +5,10 @@
 
 fn\Composer\di() instanceof  fn\Composer\DI || fn\fail(__LINE__);
 
+call_user_func(require 'vendor/autoload.php', function(fn\Composer\DI $composer, fn\DI\Container $di) {
+    $composer === $di || fn\fail(__LINE__);
+});
+
 echo call_user_func(require 'vendor/autoload.php', function(Psr\Container\ContainerInterface $container) {
     return get_class($container);
 });
add class fn\DI\Container and every derived class to resolved entries