diff --git a/Configuration/Services.php b/Configuration/Services.php
index 9abedea6d9f9a89c439b7d540f74d712461ffd3d..544fa57f5a79743748f1fa472287d6b661913345 100644
--- a/Configuration/Services.php
+++ b/Configuration/Services.php
@@ -22,21 +22,29 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-return static function (\Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator $containerConfigurator): void {
+use SGalinski\SgYoutube\Form\Element\LicenceStatus;
+use SGalinski\SgYoutube\Preview\PreviewRenderer;
+use SGalinski\SgYoutube\Service\YoutubeService;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
 	$services = $containerConfigurator->services();
 	$services->defaults()
 		->private()
 		->autowire()
 		->autoconfigure();
 	$services->load('SGalinski\\SgYoutube\\', __DIR__ . '/../Classes/');
-	$services->set(\SGalinski\SgYoutube\Preview\PreviewRenderer::class)->public();
-	$services->set(\SGalinski\SgYoutube\Service\YoutubeService::class)
-		->args(['$cache' => '@cache.sgyoutube_cache'])->public()->autowire(FALSE);
+	$services->set(PreviewRenderer::class)->public();
+	$services->set(YoutubeService::class)
+		->args(['$cache' => service('cache.sgyoutube_cache')])->public()->autowire(FALSE);
 	$services->set('cache.sgyoutube_cache')
-		->class(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class)
-		->factory(['@TYPO3\CMS\Core\Cache\CacheManager', 'getCache'])
+		->class(FrontendInterface::class)
+		->factory([service(CacheManager::class), 'getCache'])
 		->args(['sgyoutube_cache']);
-	$services->set(\SGalinski\SgYoutube\Form\Element\LicenceStatus::class)
+	$services->set(LicenceStatus::class)
 		->autowire(FALSE)
 		->autoconfigure(FALSE);
 };