product repository cache does not load the product when storeId is null

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -277,7 +277,10 @@ public function __construct(
      */
     public function get($sku, $editMode = false, $storeId = null, $forceReload = false)
     {
-        $cacheKey = $this->getCacheKey([$editMode, $storeId === null ? $storeId : (int) $storeId]);
+        if ($storeId === null) {
+            $storeId = $this->storeManager->getStore()->getId();
+        }
+        $cacheKey = $this->getCacheKey([$editMode, (int) $storeId]);
         $cachedProduct = $this->getProductFromLocalCache($sku, $cacheKey);
         if ($cachedProduct === null || $forceReload) {
             $product = $this->productFactory->create();
@@ -291,9 +294,6 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal
             if ($editMode) {
                 $product->setData('_edit_mode', true);
             }
-            if ($storeId !== null) {
-                $product->setData('store_id', (int) $storeId);
-            }
             $product->load($productId);
             $this->cacheProduct($cacheKey, $product);
             $cachedProduct = $product;
@@ -307,15 +307,16 @@ public function get($sku, $editMode = false, $storeId = null, $forceReload = fal
      */
     public function getById($productId, $editMode = false, $storeId = null, $forceReload = false)
     {
-        $cacheKey = $this->getCacheKey([$editMode, $storeId === null ? $storeId : (int) $storeId]);
+        if ($storeId === null) {
+            $storeId = $this->storeManager->getStore()->getId();
+        }
+        $cacheKey = $this->getCacheKey([$editMode, (int) $storeId]);
+
         if (!isset($this->instancesById[$productId][$cacheKey]) || $forceReload) {
             $product = $this->productFactory->create();
             if ($editMode) {
                 $product->setData('_edit_mode', true);
             }
-            if ($storeId !== null) {
-                $product->setData('store_id', $storeId);
-            }
             $product->load($productId);
             if (!$product->getId()) {
                 throw new NoSuchEntityException(
@@ -714,18 +715,6 @@ public function getList(SearchCriteriaInterface $searchCriteria)
         $searchResult->setItems($collection->getItems());
         $searchResult->setTotalCount($collection->getSize());
 
-        foreach ($collection->getItems() as $product) {
-            $this->cacheProduct(
-                $this->getCacheKey(
-                    [
-                        false,
-                        $product->getStoreId()
-                    ]
-                ),
-                $product
-            );
-        }
-
         return $searchResult;
     }
 

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php

@@ -204,6 +204,21 @@ public function skuDataProvider(): array
         ];
     }
 
+    /**
+     * Get list of stores values possible
+     *
+     * @return array
+     */
+    public function storeDataProvider(): array
+    {
+        return [
+            ['storeId' => null],
+            ['storeId' => 'default'],
+            ['storeId' => '0'],
+            ['storeId' => '1'],
+        ];
+    }
+
     /**
      * Test save product with gallery image
      *
@@ -517,6 +532,125 @@ public function testConsecutiveProductsUpdateWithDifferentAttributeSets(): void
         );
     }
 
+    /**
+     * Test get and getById methods share the ProductRepository cache in both cases with a storeId null or not
+     *
+     * @return void
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @dataProvider storeDataProvider
+     */
+     public function testConsecutiveCallToGetAndGetByIdShareCacheWithEditMode(?string $storeId): void
+     {
+        $this->testConsecutiveCallToGetAndGetByIdShareCache($storeId, false);
+        $this->testConsecutiveCallToGetAndGetByIdShareCache($storeId, true);
+     }
+
+    /**
+     * Test get and getById methods share the ProductRepository cache
+     */
+    public function testConsecutiveCallToGetAndGetByIdShareCache(?string $storeId, bool $editMode): void
+    {
+        $sku = 'simple';
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+
+        $product = $this->productRepository->get($sku, $editMode, $storeId);
+        if ($storeId!== null && (int) $storeId == $storeId) { // this will be testing the use case where storeId is a string such as '0', '1', '2'..
+            $product3 = $this->productRepository->get($sku, $editMode, (int) $storeId);
+            $product4 = $this->productRepository->getById($product->getId(), $editMode, (int) $storeId);
+        }
+
+        $product2 = $this->productRepository->getById($product->getId(), $editMode, $storeId);
+        $this->assertSame($product->getName(), $product2->getName());
+
+        $reflection = new \ReflectionClass($this->productRepository);
+        $reflection_property = $reflection->getProperty('instancesById');
+        $reflection_property->setAccessible(true);
+        $cacheIdContent = $reflection_property->getValue($this->productRepository);
+
+        $reflection = new \ReflectionClass($this->productRepository);
+        $reflection_property = $reflection->getProperty('instances');
+        $reflection_property->setAccessible(true);
+        $cacheSkuContent = $reflection_property->getValue($this->productRepository);
+
+        $this->assertEquals(1, count($cacheIdContent[$product->getId()]));
+        $this->assertEquals(1, count($cacheSkuContent[$sku]));
+    }
+
+    /**
+     * Test get and getById methods share the ProductRepository cache in both cases with when storeId is not passed and with editMode values
+     *
+     * @return void
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testConsecutiveCallToGetAndGetByIdShareCacheInEdgeCase(): void
+    {
+        $sku = 'simple';
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+
+        $product = $this->productRepository->get($sku);
+        $product2 = $this->productRepository->getById($product->getId());
+        $product3 = $this->productRepository->get($sku, false);
+        $product4 = $this->productRepository->getById($product->getId(), false);
+        $this->assertSame($product->getName(), $product2->getName());
+
+        $reflection = new \ReflectionClass($this->productRepository);
+        $reflection_property = $reflection->getProperty('instancesById');
+        $reflection_property->setAccessible(true);
+        $cacheIdContent = $reflection_property->getValue($this->productRepository);
+
+        $reflection = new \ReflectionClass($this->productRepository);
+        $reflection_property = $reflection->getProperty('instances');
+        $reflection_property->setAccessible(true);
+        $cacheSkuContent = $reflection_property->getValue($this->productRepository);
+
+        $this->assertEquals(1, count($cacheIdContent[$product->getId()]));
+        $this->assertEquals(1, count($cacheSkuContent[$sku]));
+
+        $product3 = $this->productRepository->get($sku, true);
+        $this->assertEquals(1, count($cacheIdContent[$product->getId()]));
+        $this->assertEquals(1, count($cacheSkuContent[$sku]));
+        $product4 = $this->productRepository->getById($product->getId(), true);
+        $this->assertEquals(1, count($cacheIdContent[$product->getId()]));
+        $this->assertEquals(1, count($cacheSkuContent[$sku]));
+    }
+
+    /**
+     * Test getList method does not store the result in the ProductRepository cache
+     *
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
+     * @return void
+     */
+    public function testGetListDoesNoUseCache(): void
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+        $list = $this->productRepository->getList($searchCriteria);
+        $count = $list->getTotalCount();
+        $this->assertGreaterThanOrEqual(1, $count);
+
+        $reflection = new \ReflectionClass($this->productRepository);
+        $reflection_property = $reflection->getProperty('instancesById');
+        $reflection_property->setAccessible(true);
+        $cacheIdContent = $reflection_property->getValue($this->productRepository);
+
+        $reflection = new \ReflectionClass($this->productRepository);
+        $reflection_property = $reflection->getProperty('instances');
+        $reflection_property->setAccessible(true);
+        $cacheSkuContent = $reflection_property->getValue($this->productRepository);
+
+        $this->assertEmpty($cacheIdContent);
+        $this->assertEmpty($cacheSkuContent);
+    }
+
     /**
      * Get Simple Product Data
      *