Fixes for non-cached behavior

tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php

@@ -28,7 +28,9 @@ public function setUp() : void
         $annotationDriver = $this->createAnnotationDriver();
 
         $this->em = $this->getTestEntityManager();
+
         $this->em->getConfiguration()->setMetadataDriverImpl($annotationDriver);
+
         $this->factory  = $this->em->getMetadataFactory();
         $this->listener = new ResolveTargetEntityListener();
     }
@@ -63,9 +65,12 @@ public function testResolveTargetEntityListenerCanResolveTargetEntity() : void
      */
     public function testResolveTargetEntityListenerCanRetrieveTargetEntityByInterfaceName() : void
     {
+        $evm = $this->em->getEventManager();
+
         $this->listener->addResolveTargetEntity(ResolveTarget::class, ResolveTargetEntity::class);
+        $this->listener->addResolveTargetEntity(Target::class, TargetEntity::class);
 
-        $this->em->getEventManager()->addEventSubscriber($this->listener);
+        $evm->addEventSubscriber($this->listener);
 
         $cm = $this->factory->getMetadataFor(ResolveTarget::class);
 
@@ -78,10 +83,12 @@ public function testResolveTargetEntityListenerCanRetrieveTargetEntityByInterfac
     public function testAssertTableColumnsAreNotAddedInManyToMany() : void
     {
         $evm = $this->em->getEventManager();
+
         $this->listener->addResolveTargetEntity(ResolveTarget::class, ResolveTargetEntity::class);
         $this->listener->addResolveTargetEntity(Target::class, TargetEntity::class);
 
         $evm->addEventListener(Events::loadClassMetadata, $this->listener);
+
         $cm   = $this->factory->getMetadataFor(ResolveTargetEntity::class);
         $meta = $cm->getProperty('manyToMany');
 
@@ -96,6 +103,7 @@ public function testAssertTableColumnsAreNotAddedInManyToMany() : void
     public function testDoesResolveTargetEntitiesInDQLAlsoWithInterfaces() : void
     {
         $evm = $this->em->getEventManager();
+
         $this->listener->addResolveTargetEntity(ResolveTarget::class, ResolveTargetEntity::class);
 
         $evm->addEventSubscriber($this->listener);