diff --git a/Classes/Aspect/BreadcrumbListAspect.php b/Classes/Aspect/BreadcrumbListAspect.php
index d2d22bac..39c59d62 100644
--- a/Classes/Aspect/BreadcrumbListAspect.php
+++ b/Classes/Aspect/BreadcrumbListAspect.php
@@ -13,7 +13,7 @@
 use Brotkrueml\Schema\Core\Model\AbstractType;
 use Brotkrueml\Schema\Manager\SchemaManager;
 use Brotkrueml\Schema\Model\Type;
-use Brotkrueml\Schema\Utility\Utility;
+use Brotkrueml\Schema\Provider\TypesProvider;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -27,17 +27,22 @@ final class BreadcrumbListAspect implements AspectInterface
     /** @var ExtensionConfiguration */
     private $configuration;
 
-    /** @var object|ContentObjectRenderer */
+    /** @var ContentObjectRenderer */
     private $contentObjectRenderer;
 
+    /** @var TypesProvider */
+    private $typesProvider;
+
     public function __construct(
         TypoScriptFrontendController $controller = null,
         ExtensionConfiguration $configuration = null,
-        ContentObjectRenderer $contentObjectRenderer = null
+        ContentObjectRenderer $contentObjectRenderer = null,
+        TypesProvider $typesProvider = null
     ) {
-        $this->controller = $controller ?: $GLOBALS['TSFE'];
-        $this->configuration = $configuration ?: GeneralUtility::makeInstance(ExtensionConfiguration::class);
-        $this->contentObjectRenderer = $contentObjectRenderer ?: GeneralUtility::makeInstance(ContentObjectRenderer::class);
+        $this->controller = $controller ?? $GLOBALS['TSFE'];
+        $this->configuration = $configuration ?? GeneralUtility::makeInstance(ExtensionConfiguration::class);
+        $this->contentObjectRenderer = $contentObjectRenderer ?? GeneralUtility::makeInstance(ContentObjectRenderer::class);
+        $this->typesProvider = $typesProvider ?? new TypesProvider();
     }
 
     public function execute(SchemaManager $schemaManager): void
@@ -77,8 +82,8 @@ private function buildBreadCrumbList(array $rootLine): Type\BreadcrumbList
     {
         $breadcrumbList = (new Type\BreadcrumbList());
         foreach ($rootLine as $index => $page) {
-            $givenItemTypeClass = Utility::getNamespacedClassNameForType($page['tx_schema_webpagetype']);
-            $webPageTypeClass = $givenItemTypeClass ?: Type\WebPage::class;
+            $givenItemTypeClass = $this->typesProvider->resolveTypeToModel($page['tx_schema_webpagetype']);
+            $webPageTypeClass = $givenItemTypeClass ?? Type\WebPage::class;
 
             /** @var AbstractType $itemType */
             $itemType = new $webPageTypeClass();
diff --git a/Classes/Aspect/WebPageAspect.php b/Classes/Aspect/WebPageAspect.php
index b1da3670..eb2cae0c 100644
--- a/Classes/Aspect/WebPageAspect.php
+++ b/Classes/Aspect/WebPageAspect.php
@@ -12,7 +12,7 @@
 
 use Brotkrueml\Schema\Core\Model\AbstractType;
 use Brotkrueml\Schema\Manager\SchemaManager;
-use Brotkrueml\Schema\Utility\Utility;
+use Brotkrueml\Schema\Provider\TypesProvider;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -27,12 +27,17 @@ final class WebPageAspect implements AspectInterface
     /** @var ExtensionConfiguration */
     private $configuration;
 
+    /** @var TypesProvider */
+    private $typesProvider;
+
     public function __construct(
         TypoScriptFrontendController $controller = null,
-        ExtensionConfiguration $configuration = null
+        ExtensionConfiguration $configuration = null,
+        TypesProvider $typesProvider = null
     ) {
-        $this->controller = $controller ?: $GLOBALS['TSFE'];
-        $this->configuration = $configuration ?: GeneralUtility::makeInstance(ExtensionConfiguration::class);
+        $this->controller = $controller ?? $GLOBALS['TSFE'];
+        $this->configuration = $configuration ?? GeneralUtility::makeInstance(ExtensionConfiguration::class);
+        $this->typesProvider = $typesProvider ?? new TypesProvider();
     }
 
     public function execute(SchemaManager $schemaManager): void
@@ -50,10 +55,10 @@ public function execute(SchemaManager $schemaManager): void
 
         $type = $this->controller->page['tx_schema_webpagetype'] ?: static::DEFAULT_WEBPAGE_TYPE;
 
-        $webPageClass = Utility::getNamespacedClassNameForType($type);
+        $webPageClass = $this->typesProvider->resolveTypeToModel($type);
         if ($webPageClass) {
             /** @var AbstractType $webPage */
-            $webPage = GeneralUtility::makeInstance($webPageClass);
+            $webPage = new $webPageClass();
 
             if ($this->controller->page['endtime']) {
                 $webPage->setProperty('expires', \date('c', $this->controller->page['endtime']));
diff --git a/Classes/Provider/TypesProvider.php b/Classes/Provider/TypesProvider.php
index ceddc1d1..e2558ccb 100644
--- a/Classes/Provider/TypesProvider.php
+++ b/Classes/Provider/TypesProvider.php
@@ -184,4 +184,20 @@ public function getContentTypes(): array
             )
         );
     }
+
+    /**
+     * @internal Only for internal use, not a public API!
+     */
+    public function resolveTypeToModel(string $type): ?string
+    {
+        if (empty(static::$types)) {
+            $this->getTypesWithModels();
+        }
+
+        if (\array_key_exists($type, static::$types)) {
+            return static::$types[$type];
+        }
+
+        return null;
+    }
 }
diff --git a/Classes/Utility/Utility.php b/Classes/Utility/Utility.php
deleted file mode 100644
index 32c9a3cd..00000000
--- a/Classes/Utility/Utility.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Brotkrueml\Schema\Utility;
-
-/*
- * This file is part of the "schema" extension for TYPO3 CMS.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- */
-
-final class Utility
-{
-    private static $typeNamespace = 'Brotkrueml\\Schema\\Model\\Type';
-
-    /**
-     * Get the class name with namespace for a given type
-     *
-     * Returns null, if the class does not exist
-     *
-     * @param string $type Type
-     * @return string|null
-     * @internal
-     */
-    public static function getNamespacedClassNameForType(string $type): ?string
-    {
-        $className = static::$typeNamespace . '\\' . $type;
-
-        if (!\class_exists($className)) {
-            return null;
-        }
-
-        return $className;
-    }
-
-    /**
-     * Only for testing purposes!
-     *
-     * @param string $namespace
-     * @return string
-     *
-     * @internal
-     */
-    public static function setNamespaceForTypes(string $namespace): string
-    {
-        $originalNamespace = static::$typeNamespace;
-        static::$typeNamespace = $namespace;
-
-        return $originalNamespace;
-    }
-}
diff --git a/Classes/ViewHelpers/BreadcrumbViewHelper.php b/Classes/ViewHelpers/BreadcrumbViewHelper.php
index 74fea289..17637875 100644
--- a/Classes/ViewHelpers/BreadcrumbViewHelper.php
+++ b/Classes/ViewHelpers/BreadcrumbViewHelper.php
@@ -15,7 +15,7 @@
 use Brotkrueml\Schema\Model\Type\BreadcrumbList;
 use Brotkrueml\Schema\Model\Type\ListItem;
 use Brotkrueml\Schema\Model\Type\WebPage;
-use Brotkrueml\Schema\Utility\Utility;
+use Brotkrueml\Schema\Provider\TypesProvider;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper;
@@ -101,7 +101,7 @@ public static function renderStatic(
         for ($i = 0; $i < count($arguments[static::ARGUMENT_BREADCRUMB]); $i++) {
             $webPageTypeClass = WebPage::class;
             if (static::hasWebPageType($arguments[static::ARGUMENT_BREADCRUMB][$i])) {
-                $givenItemTypeClass = Utility::getNamespacedClassNameForType($arguments[static::ARGUMENT_BREADCRUMB][$i]['data']['tx_schema_webpagetype']);
+                $givenItemTypeClass = (new TypesProvider())->resolveTypeToModel($arguments[static::ARGUMENT_BREADCRUMB][$i]['data']['tx_schema_webpagetype']);
                 $webPageTypeClass = $givenItemTypeClass ?: $webPageTypeClass;
             }
 
diff --git a/Tests/Unit/Aspect/BreadcrumbListAspectTest.php b/Tests/Unit/Aspect/BreadcrumbListAspectTest.php
index 5ed19942..c4fcb89b 100644
--- a/Tests/Unit/Aspect/BreadcrumbListAspectTest.php
+++ b/Tests/Unit/Aspect/BreadcrumbListAspectTest.php
@@ -5,9 +5,11 @@
 
 use Brotkrueml\Schema\Aspect\BreadcrumbListAspect;
 use Brotkrueml\Schema\Manager\SchemaManager;
+use Brotkrueml\Schema\Provider\TypesProvider;
+use Brotkrueml\Schema\Tests\Fixtures\Model\Type\ItemPage;
 use Brotkrueml\Schema\Tests\Helper\SchemaCacheTrait;
-use Brotkrueml\Schema\Tests\Unit\Helper\TypeFixtureNamespace;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
@@ -20,7 +22,6 @@
 class BreadcrumbListAspectTest extends UnitTestCase
 {
     use SchemaCacheTrait;
-    use TypeFixtureNamespace;
 
     protected $resetSingletonInstances = true;
 
@@ -36,6 +37,9 @@ class BreadcrumbListAspectTest extends UnitTestCase
     /** @var MockObject|ContentObjectRenderer */
     protected $contentObjectRendererMock;
 
+    /** @var Stub|TypesProvider */
+    private $typesProviderStub;
+
     protected function setUp(): void
     {
         $this->defineCacheStubsWhichReturnEmptyEntry();
@@ -70,7 +74,8 @@ public function automaticBreadcrumbListGenerationIsDeactivated(): void
         (new BreadcrumbListAspect(
             $this->controllerMock,
             $configurationMock,
-            $this->contentObjectRendererMock
+            $this->contentObjectRendererMock,
+            $this->typesProviderStub
         ))
             ->execute($schemaManagerMock);
     }
@@ -79,6 +84,7 @@ protected function setUpGeneralMocks(): void
     {
         $this->controllerMock = $this->createMock(TypoScriptFrontendController::class);
         $this->contentObjectRendererMock = $this->createMock(ContentObjectRenderer::class);
+        $this->typesProviderStub = $this->createStub(TypesProvider::class);
     }
 
     /**
@@ -99,7 +105,8 @@ public function withActivatedConfigurationOptionAndEmptyRootlineNoMarkupIsGenera
         (new BreadcrumbListAspect(
             $this->controllerMock,
             $this->getExtensionConfigurationMockWithGetReturnsTrue(),
-            $this->contentObjectRendererMock
+            $this->contentObjectRendererMock,
+            $this->typesProviderStub
         ))
             ->execute($schemaManagerMock);
     }
@@ -121,30 +128,6 @@ private function getExtensionConfigurationMockWithGetReturnsTrue()
 
     public function rootLineProvider(): iterable
     {
-        yield 'Rootline with web page type set' => [
-            [
-                2 => [
-                    'uid' => 2,
-                    'doktype' => PageRepository::DOKTYPE_DEFAULT,
-                    'title' => 'A page',
-                    'nav_title' => '',
-                    'nav_hide' => '0',
-                    'is_siteroot' => '0',
-                    'tx_schema_webpagetype' => 'ItemPage',
-                ],
-                1 => [
-                    'uid' => 1,
-                    'doktype' => PageRepository::DOKTYPE_DEFAULT,
-                    'title' => 'Site root page',
-                    'nav_title' => '',
-                    'nav_hide' => '0',
-                    'is_siteroot' => '1',
-                    'tx_schema_webpagetype' => '',
-                ],
-            ],
-            '<script type="application/ld+json">{"@context":"http://schema.org","@type":"BreadcrumbList","itemListElement":{"@type":"ListItem","item":{"@type":"ItemPage","@id":"https://example.org/the-page/"},"name":"A page","position":"1"}}</script>',
-        ];
-
         yield 'Rootline with nav_title set' => [
             [
                 2 => [
@@ -329,7 +312,8 @@ public function breadCrumbIsGeneratedCorrectly(array $rootLine, string $expected
         $subject = new BreadcrumbListAspect(
             $this->controllerMock,
             $this->getExtensionConfigurationMockWithGetReturnsTrue(),
-            $this->contentObjectRendererMock
+            $this->contentObjectRendererMock,
+            $this->typesProviderStub
         );
 
         $subject->execute($schemaManager);
@@ -380,7 +364,7 @@ public function breadCrumbIsSortedCorrectly(): void
             ])
             ->willReturn('https://example.org/level-4/');
 
-        $this->controllerMock->rootLine =             [
+        $this->controllerMock->rootLine = [
             [
                 'uid' => 111,
                 'doktype' => PageRepository::DOKTYPE_DEFAULT,
@@ -433,11 +417,73 @@ public function breadCrumbIsSortedCorrectly(): void
         $subject = new BreadcrumbListAspect(
             $this->controllerMock,
             $this->getExtensionConfigurationMockWithGetReturnsTrue(),
-            $this->contentObjectRendererMock
+            $this->contentObjectRendererMock,
+            $this->typesProviderStub
+        );
+
+        $subject->execute($schemaManager);
+
+        self::assertSame(
+            '<script type="application/ld+json">{"@context":"http://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-1/"},"name":"Level 1","position":"1"},{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-2/"},"name":"Level 2","position":"2"},{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-3/"},"name":"Level 3","position":"3"},{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-4/"},"name":"Level 4","position":"4"}]}</script>',
+            $schemaManager->renderJsonLd()
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function rootlineWithDifferentWebPageTypeSet(): void
+    {
+        $this->setUpGeneralMocks();
+
+        $this->typesProviderStub
+            ->method('resolveTypeToModel')
+            ->with('ItemPage')
+            ->willReturn(ItemPage::class);
+
+        $this->controllerMock->rootLine = [
+            2 => [
+                'uid' => 2,
+                'doktype' => PageRepository::DOKTYPE_DEFAULT,
+                'title' => 'A page',
+                'nav_title' => '',
+                'nav_hide' => '0',
+                'is_siteroot' => '0',
+                'tx_schema_webpagetype' => 'ItemPage',
+            ],
+            1 => [
+                'uid' => 1,
+                'doktype' => PageRepository::DOKTYPE_DEFAULT,
+                'title' => 'Site root page',
+                'nav_title' => '',
+                'nav_hide' => '0',
+                'is_siteroot' => '1',
+                'tx_schema_webpagetype' => '',
+            ],
+        ];
+
+        $schemaManager = GeneralUtility::makeInstance(SchemaManager::class);
+
+        $this->contentObjectRendererMock
+            ->expects(self::once())
+            ->method('typoLink_URL')
+            ->with([
+                'parameter' => '2',
+                'forceAbsoluteUrl' => true,
+            ])
+            ->willReturn('https://example.org/the-page/');
+
+        $subject = new BreadcrumbListAspect(
+            $this->controllerMock,
+            $this->getExtensionConfigurationMockWithGetReturnsTrue(),
+            $this->contentObjectRendererMock,
+            $this->typesProviderStub
         );
 
         $subject->execute($schemaManager);
 
-        self::assertSame('<script type="application/ld+json">{"@context":"http://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-1/"},"name":"Level 1","position":"1"},{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-2/"},"name":"Level 2","position":"2"},{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-3/"},"name":"Level 3","position":"3"},{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/level-4/"},"name":"Level 4","position":"4"}]}</script>', $schemaManager->renderJsonLd());
+        $expected = '<script type="application/ld+json">{"@context":"http://schema.org","@type":"BreadcrumbList","itemListElement":{"@type":"ListItem","item":{"@type":"ItemPage","@id":"https://example.org/the-page/"},"name":"A page","position":"1"}}</script>';
+
+        self::assertSame($expected, $schemaManager->renderJsonLd());
     }
 }
diff --git a/Tests/Unit/Aspect/WebPageAspectTest.php b/Tests/Unit/Aspect/WebPageAspectTest.php
index 7c7514d6..5cc428c6 100644
--- a/Tests/Unit/Aspect/WebPageAspectTest.php
+++ b/Tests/Unit/Aspect/WebPageAspectTest.php
@@ -5,22 +5,25 @@
 
 use Brotkrueml\Schema\Aspect\WebPageAspect;
 use Brotkrueml\Schema\Manager\SchemaManager;
+use Brotkrueml\Schema\Provider\TypesProvider;
 use Brotkrueml\Schema\Tests\Fixtures\Model\Type\ItemPage;
 use Brotkrueml\Schema\Tests\Fixtures\Model\Type\WebPage;
 use Brotkrueml\Schema\Tests\Helper\SchemaCacheTrait;
-use Brotkrueml\Schema\Tests\Unit\Helper\TypeFixtureNamespace;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\Package\PackageManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 class WebPageAspectTest extends TestCase
 {
     use SchemaCacheTrait;
-    use TypeFixtureNamespace;
 
     protected $resetSingletonInstances = true;
 
@@ -33,15 +36,8 @@ class WebPageAspectTest extends TestCase
     /** @var MockObject|RequestHandlerInterface */
     protected $handlerMock;
 
-    public static function setUpBeforeClass(): void
-    {
-        static::setTypeNamespaceToFixtureNamespace();
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        static::restoreOriginalTypeNamespace();
-    }
+    /** @var Stub|TypesProvider */
+    private $typesProviderStub;
 
     protected function setUp(): void
     {
@@ -72,10 +68,34 @@ public function constructWorksCorrectlyWithNoParametersAreGiven(): void
         $configuration = $reflector->getProperty('configuration');
         $configuration->setAccessible(true);
 
+        $typesProvider = $reflector->getProperty('typesProvider');
+        $typesProvider->setAccessible(true);
+
+        $packageManagerStub = $this->createStub(PackageManager::class);
+        $packageManagerStub
+            ->method('getActivePackages')
+            ->willReturn([]);
+
+        GeneralUtility::setSingletonInstance(PackageManager::class, $packageManagerStub);
+
+        $cacheFrontendStub = $this->createStub(FrontendInterface::class);
+        $cacheFrontendStub
+            ->method('get')
+            ->willReturn([]);
+
+        $cacheManagerStub = $this->createStub(CacheManager::class);
+        $cacheManagerStub
+            ->method('getCache')
+            ->with('tx_schema_core')
+            ->willReturn($cacheFrontendStub);
+
+        GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerStub);
+
         $subject = new WebPageAspect();
 
         self::assertSame('fake controller', $controller->getValue($subject));
         self::assertInstanceOf(ExtensionConfiguration::class, $configuration->getValue($subject));
+        self::assertInstanceOf(TypesProvider::class, $typesProvider->getValue($subject));
 
         unset($GLOBALS['TSFE']);
     }
@@ -103,13 +123,18 @@ public function whenAutomaticWebPageGenerationIsDeactivatedNoTypeIsAdded()
             ->expects(self::never())
             ->method('hasWebPage');
 
-        (new WebPageAspect($this->controllerMock, $configurationMock))
+        (new WebPageAspect(
+            $this->controllerMock,
+            $configurationMock,
+            $this->typesProviderStub
+        ))
             ->execute($schemaManagerMock);
     }
 
     protected function setUpGeneralMocks(): void
     {
         $this->controllerMock = $this->createMock(TypoScriptFrontendController::class);
+        $this->typesProviderStub = $this->createStub(TypesProvider::class);
     }
 
     /**
@@ -130,7 +155,8 @@ public function withAssignedWebPageModelRequestIsDirectlyPassedOverToNextMiddlew
 
         (new WebPageAspect(
             $this->controllerMock,
-            $this->getExtensionConfigurationMockWithGetReturnsTrue()
+            $this->getExtensionConfigurationMockWithGetReturnsTrue(),
+            $this->typesProviderStub
         ))
             ->execute($schemaManagerMock);
     }
@@ -165,6 +191,11 @@ public function pagePropertyForWebPageTypeIsEmptyThenWebPageIsUsed(): void
             'endtime' => 0,
         ];
 
+        $this->typesProviderStub
+            ->method('resolveTypeToModel')
+            ->with('WebPage')
+            ->willReturn(WebPage::class);
+
         /** @var MockObject|SchemaManager $schemaManagerMock */
         $schemaManagerMock = $this->createMock(SchemaManager::class);
         $schemaManagerMock
@@ -174,7 +205,8 @@ public function pagePropertyForWebPageTypeIsEmptyThenWebPageIsUsed(): void
 
         $subject = new WebPageAspect(
             $this->controllerMock,
-            $this->getExtensionConfigurationMockWithGetReturnsTrue()
+            $this->getExtensionConfigurationMockWithGetReturnsTrue(),
+            $this->typesProviderStub
         );
 
         $subject->execute($schemaManagerMock);
@@ -195,6 +227,11 @@ public function pagePropertyForWebPageTypeIsSetThenThisTypeIsUsed(): void
             'endtime' => 0,
         ];
 
+        $this->typesProviderStub
+            ->method('resolveTypeToModel')
+            ->with('ItemPage')
+            ->willReturn(ItemPage::class);
+
         /** @var MockObject|SchemaManager $schemaManagerMock */
         $schemaManagerMock = $this->createMock(SchemaManager::class);
         $schemaManagerMock
@@ -204,7 +241,8 @@ public function pagePropertyForWebPageTypeIsSetThenThisTypeIsUsed(): void
 
         $subject = new WebPageAspect(
             $this->controllerMock,
-            $this->getExtensionConfigurationMockWithGetReturnsTrue()
+            $this->getExtensionConfigurationMockWithGetReturnsTrue(),
+            $this->typesProviderStub
         );
 
         $subject->execute($schemaManagerMock);
@@ -225,6 +263,11 @@ public function pagePropertyForEndtimeIsSetThenExpiresPropertyIsSet(): void
             'endtime' => 1561672753,
         ];
 
+        $this->typesProviderStub
+            ->method('resolveTypeToModel')
+            ->with('WebPage')
+            ->willReturn(WebPage::class);
+
         /** @var MockObject|SchemaManager $schemaManagerMock */
         $schemaManagerMock = $this->createMock(SchemaManager::class);
         $schemaManagerMock
@@ -234,7 +277,8 @@ public function pagePropertyForEndtimeIsSetThenExpiresPropertyIsSet(): void
 
         $subject = new WebPageAspect(
             $this->controllerMock,
-            $this->getExtensionConfigurationMockWithGetReturnsTrue()
+            $this->getExtensionConfigurationMockWithGetReturnsTrue(),
+            $this->typesProviderStub
         );
 
         $subject->execute($schemaManagerMock);
@@ -261,7 +305,8 @@ public function whenTypeDoesNotExistsNoWebPageIsSet(): void
 
         (new WebPageAspect(
             $this->controllerMock,
-            $this->getExtensionConfigurationMockWithGetReturnsTrue()
+            $this->getExtensionConfigurationMockWithGetReturnsTrue(),
+            $this->typesProviderStub
         ))
             ->execute($schemaManagerMock);
     }
diff --git a/Tests/Unit/Helper/TypeFixtureNamespace.php b/Tests/Unit/Helper/TypeFixtureNamespace.php
deleted file mode 100644
index 52991584..00000000
--- a/Tests/Unit/Helper/TypeFixtureNamespace.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Brotkrueml\Schema\Tests\Unit\Helper;
-
-use Brotkrueml\Schema\Tests\Fixtures\Paths;
-use Brotkrueml\Schema\Utility\Utility;
-
-trait TypeFixtureNamespace
-{
-    /** @var string */
-    private static $originalNamespace;
-
-    public static function setTypeNamespaceToFixtureNamespace(): void
-    {
-        static::$originalNamespace = Utility::setNamespaceForTypes(Paths::TYPE_PATH);
-    }
-
-    public static function restoreOriginalTypeNamespace(): void
-    {
-        Utility::setNamespaceForTypes(static::$originalNamespace);
-    }
-}
diff --git a/Tests/Unit/Provider/TypesProviderTest.php b/Tests/Unit/Provider/TypesProviderTest.php
index 4e949332..4ef8d831 100644
--- a/Tests/Unit/Provider/TypesProviderTest.php
+++ b/Tests/Unit/Provider/TypesProviderTest.php
@@ -4,6 +4,7 @@
 namespace Brotkrueml\Schema\Tests\Unit\Provider;
 
 use Brotkrueml\Schema\Provider\TypesProvider;
+use Brotkrueml\Schema\Tests\Fixtures\Model\Type\FixtureImage;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use TYPO3\CMS\Core\Cache\CacheManager;
@@ -257,4 +258,32 @@ public function getContentTypesReturnsOnlyTheContentTypes(): void
 
         self::assertSame(['FixtureImage', 'FixtureThing'], $actual);
     }
+
+    /**
+     * @test
+     */
+    public function resolveTypeToModelReturnsCorrectModel(): void
+    {
+        $this->cacheFrontendMock
+            ->method('has')
+            ->willReturn(false);
+
+        $actual = $this->subject->resolveTypeToModel('FixtureImage');
+
+        self::assertSame(FixtureImage::class, $actual);
+    }
+
+    /**
+     * @test
+     */
+    public function resolveTypeToModelReturnsNullWhenTypeNotAvailable(): void
+    {
+        $this->cacheFrontendMock
+            ->method('has')
+            ->willReturn(false);
+
+        $actual = $this->subject->resolveTypeToModel('NotConfiguredType');
+
+        self::assertNull($actual);
+    }
 }
diff --git a/Tests/Unit/Utility/UtilityTest.php b/Tests/Unit/Utility/UtilityTest.php
deleted file mode 100644
index 70a79095..00000000
--- a/Tests/Unit/Utility/UtilityTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Brotkrueml\Schema\Tests\Unit\Utility;
-
-use Brotkrueml\Schema\Model\Type\Thing;
-use Brotkrueml\Schema\Utility\Utility;
-use PHPUnit\Framework\TestCase;
-
-class UtilityTest extends TestCase
-{
-    /**
-     * @test
-     */
-    public function getNamespacedClassNameForType(): void
-    {
-        $actual = Utility::getNamespacedClassNameForType('Thing');
-
-        self::assertSame(Thing::class, $actual);
-    }
-
-    /**
-     * @test
-     */
-    public function getNamespacedClassNameForTypeReturnsNullIftypeDoesNotExist(): void
-    {
-        $actual = Utility::getNamespacedClassNameForType('DoesNotExist');
-
-        self::assertNull($actual);
-    }
-
-    /**
-     * @test
-     */
-    public function setNamespaceForTypesReturnsOriginalNamespace(): void
-    {
-        $originalNamespace = Utility::setNamespaceForTypes('\\Some\\Namespace');
-
-        self::assertSame('Brotkrueml\\Schema\\Model\\Type', $originalNamespace);
-
-        Utility::setNamespaceForTypes($originalNamespace);
-    }
-}
diff --git a/Tests/Unit/ViewHelpers/BreadcrumbViewHelperTest.php b/Tests/Unit/ViewHelpers/BreadcrumbViewHelperTest.php
index efbbda36..beac9f20 100644
--- a/Tests/Unit/ViewHelpers/BreadcrumbViewHelperTest.php
+++ b/Tests/Unit/ViewHelpers/BreadcrumbViewHelperTest.php
@@ -3,8 +3,13 @@
 
 namespace Brotkrueml\Schema\Tests\Unit\ViewHelpers;
 
+use Brotkrueml\Schema\Tests\Fixtures\Model\Type\ItemPage;
+use Brotkrueml\Schema\Tests\Fixtures\Model\Type\VideoGallery;
+use Brotkrueml\Schema\Tests\Fixtures\Model\Type\WebPage;
 use Brotkrueml\Schema\Tests\Helper\SchemaCacheTrait;
-use Brotkrueml\Schema\Tests\Unit\Helper\TypeFixtureNamespace;
+use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Cache\Frontend\PhpFrontend;
+use TYPO3\CMS\Core\Package\PackageManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\Parser;
 use TYPO3Fluid\Fluid\Core\ViewHelper;
@@ -12,19 +17,6 @@
 class BreadcrumbViewHelperTest extends ViewHelperTestCase
 {
     use SchemaCacheTrait;
-    use TypeFixtureNamespace;
-
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-        static::setTypeNamespaceToFixtureNamespace();
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        static::restoreOriginalTypeNamespace();
-        parent::tearDownAfterClass();
-    }
 
     protected function setUp(): void
     {
@@ -96,36 +88,6 @@ public function fluidTemplatesProvider(): iterable
             '<script type="application/ld+json">{"@context":"http://schema.org","@type":"BreadcrumbList","itemListElement":{"@type":"ListItem","item":{"@type":"WebPage","@id":"https://example.org/sub-page/"},"name":"Some sub page","position":"1"}}</script>',
         ];
 
-        yield 'Breadcrumb with multiple pages and webpage types given' => [
-            '<schema:breadcrumb breadcrumb="{breadcrumb}"/>',
-            [
-                'breadcrumb' => [
-                    [
-                        'title' => 'A web page',
-                        'link' => '/',
-                        'data' => [
-                            'tx_schema_webpagetype' => 'WebPage',
-                        ],
-                    ],
-                    [
-                        'title' => 'Video overview',
-                        'link' => '/videos/',
-                        'data' => [
-                            'tx_schema_webpagetype' => 'VideoGallery',
-                        ],
-                    ],
-                    [
-                        'title' => 'Unicorns in TYPO3 land',
-                        'link' => '/videos/unicorns-in-typo3-land/',
-                        'data' => [
-                            'tx_schema_webpagetype' => 'ItemPage',
-                        ],
-                    ],
-                ],
-            ],
-            '<script type="application/ld+json">{"@context":"http://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","item":{"@type":"VideoGallery","@id":"https://example.org/videos/"},"name":"Video overview","position":"1"},{"@type":"ListItem","item":{"@type":"ItemPage","@id":"https://example.org/videos/unicorns-in-typo3-land/"},"name":"Unicorns in TYPO3 land","position":"2"}]}</script>',
-        ];
-
         yield 'Breadcrumb with multiple pages and a class given as data item (which can happen when you add a virtual category page with a domain model to it)' => [
             '<schema:breadcrumb breadcrumb="{breadcrumb}"/>',
             [
@@ -185,6 +147,75 @@ public function itBuildsSchemaCorrectlyOutOfViewHelpers(string $template, array
         self::assertSame($expected, $actual);
     }
 
+    /**
+     * @test
+     */
+    public function breadcrumbWithMultiplePagesAndWebPageTypesGiven(): void
+    {
+        /** @noinspection PhpInternalEntityUsedInspection */
+        GeneralUtility::setIndpEnv('TYPO3_SITE_URL', 'https://example.org/');
+
+        $cacheFrontendStub = $this->createStub(PhpFrontend::class);
+        $cacheFrontendStub
+            ->method('has')
+            ->willReturn(true);
+        $cacheFrontendStub
+            ->method('require')
+            ->willReturn([
+                'ItemPage' => ItemPage::class,
+                'VideoGallery' => VideoGallery::class,
+                'WebPage' => WebPage::class,
+            ]);
+
+        $cacheManagerStub = $this->createStub(CacheManager::class);
+        $cacheManagerStub
+            ->method('getCache')
+            ->with(self::anything())
+            ->willReturn($cacheFrontendStub);
+
+        GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerStub);
+
+        $packageManagerStub = $this->createStub(PackageManager::class);
+        $packageManagerStub
+            ->method('getActivePackages')
+            ->willReturn([]);
+
+        GeneralUtility::setSingletonInstance(PackageManager::class, $packageManagerStub);
+
+        $variables = [
+            'breadcrumb' => [
+                [
+                    'title' => 'A web page',
+                    'link' => '/',
+                    'data' => [
+                        'tx_schema_webpagetype' => 'WebPage',
+                    ],
+                ],
+                [
+                    'title' => 'Video overview',
+                    'link' => '/videos/',
+                    'data' => [
+                        'tx_schema_webpagetype' => 'VideoGallery',
+                    ],
+                ],
+                [
+                    'title' => 'Unicorns in TYPO3 land',
+                    'link' => '/videos/unicorns-in-typo3-land/',
+                    'data' => [
+                        'tx_schema_webpagetype' => 'ItemPage',
+                    ],
+                ],
+            ],
+        ];
+
+        $this->renderTemplate('<schema:breadcrumb breadcrumb="{breadcrumb}"/>', $variables);
+
+        $actual = $this->schemaManager->renderJsonLd();
+        $expected = '<script type="application/ld+json">{"@context":"http://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","item":{"@type":"VideoGallery","@id":"https://example.org/videos/"},"name":"Video overview","position":"1"},{"@type":"ListItem","item":{"@type":"ItemPage","@id":"https://example.org/videos/unicorns-in-typo3-land/"},"name":"Unicorns in TYPO3 land","position":"2"}]}</script>';
+
+        self::assertSame($expected, $actual);
+    }
+
     /**
      * Data provider for some cases where exceptions are thrown when using the property view helper incorrectly
      *