Update Cache component doc for 4.2

Author: nicolas-grekas

components/cache.rst

@@ -24,8 +24,6 @@ Installation
 
 .. include:: /components/require_autoload.rst.inc
 
-.. _cache-psr-6-versus-simple-cache-psr-16:
-
 Cache Contracts versus PSR-6
 ----------------------------
 
@@ -37,17 +35,6 @@ This component includes *two* different approaches to caching:
 :ref:`Cache Contracts <cache-component-contracts>`:
     A simple yet powerful way to store, fetch and remove values from a cache.
 
-.. tip::
-
-    Using the Cache Contracts approach is recommended: using it requires less
-    code boilerplate and provides cache stampede protection by default.
-
-.. tip::
-
-    The component also contains adapters to convert between PSR-6, PSR-16 and
-    Doctrine caches. See :doc:`/components/cache/psr6_psr16_adapters` and
-    :doc:`/components/cache/adapters/doctrine_adapter`.
-
 .. _cache-component-contracts:
 
 Cache Contracts
@@ -121,6 +108,17 @@ recompute::
         return '...';
     }, $beta);
 
+.. tip::
+
+    Using the Cache Contracts approach is recommended: using it requires less
+    code boilerplate and provides cache stampede protection by default.
+
+.. tip::
+
+    The component also contains adapters to convert between PSR-6, PSR-16 and
+    Doctrine caches. See :doc:`/components/cache/psr6_psr16_adapters` and
+    :doc:`/components/cache/adapters/doctrine_adapter`.
+
 Available Cache Adapters
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -199,8 +197,6 @@ Now you can create, retrieve, update and delete items using this cache pool::
 
 For a list of all of the supported adapters, see :doc:`/components/cache/cache_pools`.
 
-.. _advanced-usage-psr-6:
-
 Advanced Usage
 --------------