diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
index 3ce8519c26..ab318d1334 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\Controller;
 
-use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\ValueResolver;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver;
@@ -31,34 +30,39 @@ use Symfony\Contracts\Service\ServiceProviderInterface;
  */
 final class ArgumentResolver implements ArgumentResolverInterface
 {
-    private ArgumentMetadataFactoryInterface $argumentMetadataFactory;
-    private ServiceProviderInterface $argumentValueResolvers;
-
     /**
      * @param iterable<mixed, ArgumentValueResolverInterface|ValueResolverInterface>|ServiceProviderInterface<ValueResolverInterface> $argumentValueResolvers
      */
-    public function __construct(ArgumentMetadataFactoryInterface $argumentMetadataFactory = null, iterable|ServiceProviderInterface $argumentValueResolvers = [])
-    {
-        $this->argumentMetadataFactory = $argumentMetadataFactory ?? new ArgumentMetadataFactory();
-        $this->argumentValueResolvers = $argumentValueResolvers instanceof ServiceProviderInterface
-            ? $argumentValueResolvers
-            : self::getServiceProvider($argumentValueResolvers ?: self::getDefaultArgumentValueResolvers())
-        ;
+    public function __construct(
+        private ArgumentMetadataFactoryInterface|null $argumentMetadataFactory = new ArgumentMetadataFactory(),
+        private iterable|ServiceProviderInterface $argumentValueResolvers = [],
+    ) {
+        if (null === $argumentMetadataFactory) {
+            $this->argumentMetadataFactory = new ArgumentMetadataFactory();
+            trigger_deprecation('symfony/http-kernel', '6.3', 'Passing null as $argumentMetadataFactory to "%s" is deprecated. Pass a "%s" instead.', static::class, ArgumentMetadataFactory::class);
+        }
     }
 
     public function getArguments(Request $request, callable $controller, \ReflectionFunctionAbstract $reflector = null): array
     {
         $arguments = [];
-        $resolversName = array_keys($this->argumentValueResolvers->getProvidedServices());
+        $resolversMap = null;
+        $allResolvers = $this->argumentValueResolvers ?: self::getDefaultArgumentValueResolvers();
+        $isProvider = $allResolvers instanceof ServiceProviderInterface;
 
         foreach ($this->argumentMetadataFactory->createArgumentMetadata($controller, $reflector) as $metadata) {
-            $argumentResolversName = $resolversName;
+
             if ($attributes = $metadata->getAttributesOfType(ValueResolver::class)) {
-                $argumentResolversName = [$attributes[0]->name];
+                $name = $attributes[0]->name;
+                $resolvers = [$name => $isProvider ? null : ($resolversMap ??= self::getResolversMap($allResolvers))[$name]];
+            } else {
+                $resolvers = $isProvider ? $allResolvers->getProvidedServices() : $allResolvers;
             }
 
-            foreach ($argumentResolversName as $resolverName) {
-                $resolver = $this->argumentValueResolvers->get($resolverName);
+            foreach ($resolvers as $name => $resolver) {
+                if ($isProvider) {
+                    $resolver = $allResolvers->get($name);
+                }
 
                 if ((!$resolver instanceof ValueResolverInterface || $resolver instanceof TraceableValueResolver) && !$resolver->supports($request, $metadata)) {
                     continue;
@@ -115,16 +119,16 @@ final class ArgumentResolver implements ArgumentResolverInterface
     /**
      * @param iterable<ArgumentValueResolverInterface|ValueResolverInterface> $resolvers
      *
-     * @return ServiceProviderInterface<ArgumentValueResolverInterface|ValueResolverInterface>
+     * @return array<string, ArgumentValueResolverInterface|ValueResolverInterface>
      */
-    private static function getServiceProvider(iterable $resolvers): ServiceProviderInterface
+    private static function getResolversMap(iterable $resolvers): array
     {
-        $factories = [];
+        $map = [];
         $i = 0;
         foreach ($resolvers as $name => $resolver) {
-            $factories[$name === $i++ ? $resolver::class : $name] = static fn () => $resolver;
+            $map[$name === $i++ ? $resolver::class : $name] = $resolver;
         }
 
-        return new ServiceLocator($factories);
+        return $map;
     }
 }