symfony
diff --git a/‎src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
+4-33Lines changed: 4 additions & 33 deletions b/‎src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php
+4-33Lines changed: 4 additions & 33 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
+4-4Lines changed: 4 additions & 4 deletions b/‎src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
+4-4Lines changed: 4 additions & 4 deletions
@@ -38,11 +38,6 @@ class LazyChoiceList implements ChoiceListInterface
      */
     private $value;
 
-    /**
-     * @var ChoiceListInterface|null
-     */
-    private $loadedList;
-
     /**
      * Creates a lazily-loaded list using the given loader.
      *
@@ -63,58 +58,38 @@ public function __construct(ChoiceLoaderInterface $loader, callable $value = nul
      */
     public function getChoices()
     {
-        if ($this->loadedList) {
-            return $this->loadedList->getChoices();
-        }
-
-        return ($this->loadedList = $this->loader->loadChoiceList($this->value))->getChoices();
+        return $this->loader->loadChoiceList($this->value)->getChoices();
     }
 
     /**
      * {@inheritdoc}
      */
     public function getValues()
     {
-        if ($this->loadedList) {
-            return $this->loadedList->getValues();
-        }
-
-        return ($this->loadedList = $this->loader->loadChoiceList($this->value))->getValues();
+        return $this->loader->loadChoiceList($this->value)->getValues();
     }
 
     /**
      * {@inheritdoc}
      */
     public function getStructuredValues()
     {
-        if ($this->loadedList) {
-            return $this->loadedList->getStructuredValues();
-        }
-
-        return ($this->loadedList = $this->loader->loadChoiceList($this->value))->getStructuredValues();
+        return $this->loader->loadChoiceList($this->value)->getStructuredValues();
     }
 
     /**
      * {@inheritdoc}
      */
     public function getOriginalKeys()
     {
-        if ($this->loadedList) {
-            return $this->loadedList->getOriginalKeys();
-        }
-
-        return ($this->loadedList = $this->loader->loadChoiceList($this->value))->getOriginalKeys();
+        return $this->loader->loadChoiceList($this->value)->getOriginalKeys();
     }
 
     /**
      * {@inheritdoc}
      */
     public function getChoicesForValues(array $values)
     {
-        if ($this->loadedList) {
-            return $this->loadedList->getChoicesForValues($values);
-        }
-
         return $this->loader->loadChoicesForValues($values, $this->value);
     }
 
@@ -123,10 +98,6 @@ public function getChoicesForValues(array $values)
      */
     public function getValuesForChoices(array $choices)
     {
-        if ($this->loadedList) {
-            return $this->loadedList->getValuesForChoices($choices);
-        }
-
         return $this->loader->loadValuesForChoices($choices, $this->value);
     }
 }
@@ -32,7 +32,7 @@ public function testGetChoiceLoadersLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['RESULT'], $list->getChoices());
         $this->assertSame(['RESULT'], $list->getChoices());
-        $this->assertSame(1, $calls);
+        $this->assertSame(2, $calls);
     }
 
     public function testGetValuesLoadsLoadedListOnFirstCall()
@@ -46,7 +46,7 @@ public function testGetValuesLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['RESULT'], $list->getValues());
         $this->assertSame(['RESULT'], $list->getValues());
-        $this->assertSame(1, $calls);
+        $this->assertSame(2, $calls);
     }
 
     public function testGetStructuredValuesLoadsLoadedListOnFirstCall()
@@ -60,7 +60,7 @@ public function testGetStructuredValuesLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['RESULT'], $list->getStructuredValues());
         $this->assertSame(['RESULT'], $list->getStructuredValues());
-        $this->assertSame(1, $calls);
+        $this->assertSame(2, $calls);
     }
 
     public function testGetOriginalKeysLoadsLoadedListOnFirstCall()
@@ -79,7 +79,7 @@ public function testGetOriginalKeysLoadsLoadedListOnFirstCall()
 
         $this->assertSame(['foo' => 'a', 'bar' => 'b', 'baz' => 'c'], $list->getOriginalKeys());
         $this->assertSame(['foo' => 'a', 'bar' => 'b', 'baz' => 'c'], $list->getOriginalKeys());
-        $this->assertSame(3, $calls);
+        $this->assertSame(6, $calls);
     }
 
     public function testGetChoicesForValuesForwardsCallIfListNotLoaded()