diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 14520c1c6fa7a..68c7b5d464ec4 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -369,6 +369,8 @@ UPGRADE FROM 2.x to 3.0
 
  * The `RouterApacheDumperCommand` was removed.
 
+ * The `createEsi` method of `Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache` was removed. Use `createSurrogate` instead.
+
 ### HttpKernel
 
  * The `Symfony\Component\HttpKernel\Log\LoggerInterface` has been removed in
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
index bc5a0cc82fb89..fad4adc04434d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
+++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -71,18 +71,6 @@ protected function getOptions()
     }
 
     protected function createSurrogate()
-    {
-        return $this->createEsi();
-    }
-
-    /**
-     * Creates new ESI instance
-     *
-     * @return Esi
-     *
-     * @deprecated Deprecated since version 2.6, to be removed in 3.0. Use createSurrogate() instead
-     */
-    protected function createEsi()
     {
         return new Esi();
     }