diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 2bfdedbe44ed0..bcdc83dacb912 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -444,7 +444,7 @@ UPGRADE FROM 2.x to 3.0
 ### Validator
 
  * The class `Symfony\Component\Validator\Mapping\Cache\ApcCache` has been removed in favor
-   of `Symfony\Component\Validator\Mapping\Cache\DoctrineCache`.
+   of `Symfony\Bridge\Doctrine\Validator\Mapping\DoctrineCache`.
 
    Before:
 
@@ -457,7 +457,7 @@ UPGRADE FROM 2.x to 3.0
    After:
 
    ```
-   use Symfony\Component\Validator\Mapping\Cache\DoctrineCache;
+   use Symfony\Bridge\Doctrine\Validator\Mapping\DoctrineCache;
    use Doctrine\Common\Cache\ApcCache;
 
    $apcCache = new ApcCache();
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index 9c747b8abc7b7..cda4da83a2697 100644
--- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.5.0
+-----
+
+ * added Validator\Mapping\DoctrineCache class
+
 2.2.0
 -----
 
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Cache/DoctrineCacheTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Mapping/DoctrineCacheTest.php
similarity index 95%
rename from src/Symfony/Component/Validator/Tests/Mapping/Cache/DoctrineCacheTest.php
rename to src/Symfony/Bridge/Doctrine/Tests/Validator/Mapping/DoctrineCacheTest.php
index df2d9f4104ce8..11293c8df677c 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Cache/DoctrineCacheTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Mapping/DoctrineCacheTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Validator\Tests\Mapping\Cache;
+namespace Symfony\Bridge\Doctrine\Tests\Validator\Mapping;
 
-use Symfony\Component\Validator\Mapping\Cache\DoctrineCache;
+use Symfony\Bridge\Doctrine\Validator\Mapping\DoctrineCache;
 use Doctrine\Common\Cache\ArrayCache;
 
 class DoctrineCacheTest extends \PHPUnit_Framework_TestCase
diff --git a/src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php b/src/Symfony/Bridge/Doctrine/Validator/Mapping/DoctrineCache.php
similarity index 92%
rename from src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php
rename to src/Symfony/Bridge/Doctrine/Validator/Mapping/DoctrineCache.php
index 56ead5d0ccc05..98d1f43ab839e 100644
--- a/src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Mapping/DoctrineCache.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Validator\Mapping\Cache;
+namespace Symfony\Bridge\Doctrine\Validator\Mapping;
 
+use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Doctrine\Common\Cache\Cache;
 
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
index 3eba52930f3f7..f6203efa40b15 100644
--- a/src/Symfony/Component/Validator/CHANGELOG.md
+++ b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -4,8 +4,7 @@ CHANGELOG
 2.5.0
 -----
 
- * deprecated `ApcCache` in favor of `DoctrineCache`
- * added `DoctrineCache` to adapt any Doctrine cache
+ * deprecated `ApcCache` in favor of `Symfony\Bridge\Doctrine\Validator\Mapping\DoctrineCache`
 
 2.4.0
 -----
diff --git a/src/Symfony/Component/Validator/Mapping/Cache/ApcCache.php b/src/Symfony/Component/Validator/Mapping/Cache/ApcCache.php
index 64929b09663ab..dce6762ae07dd 100644
--- a/src/Symfony/Component/Validator/Mapping/Cache/ApcCache.php
+++ b/src/Symfony/Component/Validator/Mapping/Cache/ApcCache.php
@@ -15,7 +15,8 @@
 
 /**
  * @deprecated Deprecated since version 2.5, to be removed in 3.0.
- *             Use DoctrineCache with Doctrine\Common\Cache\ApcCache instead.
+ *             Use Symfony\Bridge\Doctrine\Validator\Mapping\DoctrineCache
+ *             with Doctrine\Common\Cache\ApcCache instead.
  */
 class ApcCache implements CacheInterface
 {
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index af14eabdb63a3..7c6f837ded4f0 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/src/Symfony/Component/Validator/composer.json
@@ -30,7 +30,7 @@
     },
     "suggest": {
         "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-        "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+        "doctrine/cache": "For using the default cached annotation reader.",
         "symfony/http-foundation": "",
         "symfony/intl": "",
         "symfony/yaml": "",