MAGETWO-55682: Backport ticket https://jira.corp.magento.com/browse/MAGETWO-55514 to 2.0.11

 - backport changes

Author: Robert He

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

@@ -119,6 +119,16 @@ public function showMinimalPrice()
         && $minimalPriceAValue < $finalPriceValue;
     }
 
+    /**
+     * Get Key for caching block content
+     *
+     * @return string
+     */
+    public function getCacheKey()
+    {
+        return parent::getCacheKey() . ($this->getData('list_category_page') ? '-list-category-page': '');
+    }
+
     /**
      * {@inheritdoc}
      *

app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -81,21 +81,27 @@ protected function setUp()
             ->method('getBlock')
             ->will($this->returnValue($this->priceBox));
 
-        $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
-            ->setMethods(['getStore', 'getCode'])
+        $cacheState = $this->getMockBuilder(\Magento\Framework\App\Cache\StateInterface::class)
             ->getMockForAbstractClass();
-        $storeManager->expects($this->any())->method('getStore')->willReturnSelf();
 
-        $appState = $this->getMockBuilder('\Magento\Framework\App\State')
+        $appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $resolver = $this->getMockBuilder('\Magento\Framework\View\Element\Template\File\Resolver')
+        $resolver = $this->getMockBuilder(\Magento\Framework\View\Element\Template\File\Resolver::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $urlBuilder = $this->getMockBuilder('\Magento\Framework\UrlInterface')
+        $urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->getMockForAbstractClass();
+
+        $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->getMockForAbstractClass();
+
+        $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+            ->setMethods(['getStore', 'getCode'])
             ->getMockForAbstractClass();
+        $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
 
         $scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
         $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
@@ -114,6 +120,9 @@ protected function setUp()
         $context->expects($this->any())
             ->method('getScopeConfig')
             ->will($this->returnValue($scopeConfigMock));
+        $context->expects($this->any())
+            ->method('getCacheState')
+            ->will($this->returnValue($cacheState));
         $context->expects($this->any())
             ->method('getStoreManager')
             ->will($this->returnValue($storeManager));
@@ -124,7 +133,8 @@ protected function setUp()
             ->method('getResolver')
             ->will($this->returnValue($resolver));
         $context->expects($this->any())
-            ->method('getUrlBuilder')->will($this->returnValue($urlBuilder));
+            ->method('getUrlBuilder')
+            ->will($this->returnValue($urlBuilder));
 
         $this->rendererPool = $this->getMockBuilder('Magento\Framework\Pricing\Render\RendererPool')
             ->disableOriginalConstructor()
@@ -143,7 +153,7 @@ protected function setUp()
                 'saleableItem' => $this->product,
                 'rendererPool' => $this->rendererPool,
                 'price' => $this->price,
-                'data' => ['zone' => 'test_zone']
+                'data' => ['zone' => 'test_zone', 'list_category_page' => true]
             ]
         );
     }
@@ -240,6 +250,7 @@ public function testRenderAmountMinimal()
 
         $arguments = [
             'zone' => 'test_zone',
+            'list_category_page' => true,
             'display_label' => 'As low as',
             'price_id' => $priceId,
             'include_container' => false,
@@ -360,6 +371,12 @@ public function testHidePrice()
         $this->assertEmpty($this->object->toHtml());
     }
 
+    public function testGetCacheKey()
+    {
+        $result = $this->object->getCacheKey();
+        $this->assertStringEndsWith('list-category-page', $result);
+    }
+
     public function testGetCacheKeyInfo()
     {
         $this->assertArrayHasKey('display_minimal_price', $this->object->getCacheKeyInfo());