symfony
diff --git a/‎src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
Lines changed: 4 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
Lines changed: 20 additions & 0 deletions
@@ -99,17 +99,17 @@ public function getMetadataFor($value)
             return $this->loadedClasses[$class];
         }
 
+        if (!class_exists($class) && !interface_exists($class)) {
+            throw new NoSuchMetadataException(sprintf('The class or interface "%s" does not exist.', $class));
+        }
+
         if (null !== $this->cache && false !== ($metadata = $this->cache->read($class))) {
             // Include constraints from the parent class
             $this->mergeConstraints($metadata);
 
             return $this->loadedClasses[$class] = $metadata;
         }
 
-        if (!class_exists($class) && !interface_exists($class)) {
-            throw new NoSuchMetadataException(sprintf('The class or interface "%s" does not exist.', $class));
-        }
-
         $metadata = new ClassMetadata($class);
 
         if (null !== $this->loader) {
 
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Factory;
 
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Exception\NoSuchMetadataException;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
 use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
@@ -168,6 +170,24 @@ public function testMetadataCacheWithRuntimeConstraint()
 
         $metadata = $factory->getMetadataFor(self::CLASS_NAME);
     }
+
+    public function testNonClassNameStringValues()
+    {
+        $testedValue = 'error@example.com';
+        $loader = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
+        $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
+        $factory = new LazyLoadingMetadataFactory($loader, $cache);
+        $cache
+            ->method('read')
+            ->with($testedValue)
+            ->willThrowException(new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $testedValue)));
+        $this->expectException(NoSuchMetadataException::class);
+        try {
+            $factory->getMetadataFor($testedValue);
+        } catch (InvalidArgumentException $exception) {
+            $this->fail(sprintf('Unexpected %s thrown', InvalidArgumentException::class));
+        }
+    }
 }
 
 class TestLoader implements LoaderInterface