symfony
diff --git a/‎UPGRADE-3.1.md
Copy file name to clipboardExpand all lines: UPGRADE-3.1.md
+4-1Lines changed: 4 additions & 1 deletion b/‎UPGRADE-3.1.md
Copy file name to clipboardExpand all lines: UPGRADE-3.1.md
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎UPGRADE-4.0.md
Copy file name to clipboardExpand all lines: UPGRADE-4.0.md
+2Lines changed: 2 additions & 0 deletions b/‎UPGRADE-4.0.md
Copy file name to clipboardExpand all lines: UPGRADE-4.0.md
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/CHANGELOG.md
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/CHANGELOG.md
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
-6Lines changed: 0 additions & 6 deletions b/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
-6Lines changed: 0 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Form/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Form/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
@@ -39,7 +39,10 @@ Form
    'choice_label' => function ($choice) {
        return strtoupper($choice);
    },
-   ```   
+   ```
+
+ * Caching of the loaded `ChoiceListInterface` in the `LazyChoiceList` has been deprecated,
+   it must be cached in the `ChoiceLoaderInterface` implementation instead.
 
 FrameworkBundle
 ---------------
 
@@ -36,6 +36,8 @@ Form
    },
    ```
 
+ * Caching of the loaded `ChoiceListInterface` in the `LazyChoiceList` has been removed,
+   it must be cached in the `ChoiceLoaderInterface` implementation instead.
 
 FrameworkBundle
 ---------------
 
@@ -7,6 +7,8 @@ CHANGELOG
  * added "{{ value }}" message placeholder to UniqueEntityValidator
  * deprecated `MergeDoctrineCollectionListener::onBind` in favor of
    `MergeDoctrineCollectionListener::onSubmit`
+ * deprecated passing `ChoiceListFactoryInterface` as first argument of
+   `DoctrineChoiceLoader`'s constructor
 
 3.0.0
 -----
 
@@ -24,11 +24,6 @@
  */
 class DoctrineChoiceLoader implements ChoiceLoaderInterface
 {
-    /**
-     * @var ChoiceListFactoryInterface
-     */
-    private $factory;
-
     /**
      * @var ObjectManager
      */
@@ -78,7 +73,6 @@ public function __construct($manager, $class, $idReader = null, $objectLoader =
 
             // Provide a BC layer since $factory has changed
             // form first to last argument as of 3.1
-            $this->factory = $manager;
             $manager = $class;
             $class = $idReader;
             $objectLoader = $factory;
 
@@ -10,6 +10,7 @@ CHANGELOG
  * Using callable strings as choice options in `ChoiceType` has been deprecated
    and will be used as `PropertyPath` instead of callable in Symfony 4.0.
  * implemented `DataTransformerInterface` in `TextType`
+ * deprecated caching loaded choice list in `LazyChoiceList::$loadedList`
 
 3.0.0
 -----