MAGETWO-97411: \Magento\Customer\Model\Customer::getDataModel method takes to much time to load with many addresses customer

Author: le0n4eg

app/code/Magento/Customer/Model/Customer.php

@@ -318,21 +318,23 @@ public function _construct()
     public function getDataModel()
     {
         $customerData = $this->getData();
-        if (!isset($this->storedAddress[$customerData['entity_id']])) {
+        if (isset($customerData['entity_id']) && !isset($this->storedAddress[$customerData['entity_id']])) {
             $addressesData = [];
             /** @var \Magento\Customer\Model\Address $address */
             foreach ($this->getAddresses() as $address) {
                 $addressesData[] = $address->getDataModel();
             }
             $this->storedAddress[$customerData['entity_id']] = $addressesData;
+        } elseif (isset($customerData['entity_id'], $this->storedAddress[$customerData['entity_id']])) {
+            $customerData = $this->storedAddress[$customerData['entity_id']];
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        $customerDataObject->setAddresses($this->storedAddress[$customerData['entity_id']])
+        $customerDataObject->setAddresses($customerData)
             ->setId($this->getId());
         return $customerDataObject;
     }