diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 7b4f91f3d5d0..014fad9cd5f0 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -393,6 +393,7 @@ start() {
         -v mlnx_sdk_ready:/tmp \
         -e SX_API_SOCKET_FILE=/var/run/sx_sdk/sx_api.sock \
         -v /dev/shm:/dev/shm:rw \
+        -v /var/cache/sonic/decode-syseeprom:/var/cache/sonic/decode-syseeprom:rw \
 {%- else %}
 {%- if mount_default_tmpfs|default("n") == "y" %}
         --tmpfs /tmp \
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 274019215bec..4ce53cad5be7 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -544,6 +544,12 @@ sudo cp $IMAGE_CONFIGS/pcie-check/pcie-check.service $FILESYSTEM_ROOT_USR_LIB_SY
 echo "pcie-check.service" | sudo tee -a $GENERATED_SERVICE_FILE
 sudo cp $IMAGE_CONFIGS/pcie-check/pcie-check.sh $FILESYSTEM_ROOT/usr/bin/
 
+{% if sonic_asic_platform == "mellanox" %}
+sudo cp $IMAGE_CONFIGS/eeprom-cache-clear/eeprom-cache-clear.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
+echo "eeprom-cache-clear.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/eeprom-cache-clear/eeprom-cache-clear.sh $FILESYSTEM_ROOT/usr/bin/
+{% endif %}
+
 ## Install package without starting service
 ## ref: https://wiki.debian.org/chroot
 sudo tee -a $FILESYSTEM_ROOT/usr/sbin/policy-rc.d > /dev/null <<EOF
diff --git a/files/image_config/eeprom-cache-clear/eeprom-cache-clear.service b/files/image_config/eeprom-cache-clear/eeprom-cache-clear.service
new file mode 100644
index 000000000000..35e5a5328111
--- /dev/null
+++ b/files/image_config/eeprom-cache-clear/eeprom-cache-clear.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Clear EEPROM cache file
+After=rc.local.service database.service
+Before=pmon.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/eeprom-cache-clear.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/image_config/eeprom-cache-clear/eeprom-cache-clear.sh b/files/image_config/eeprom-cache-clear/eeprom-cache-clear.sh
new file mode 100755
index 000000000000..4af9a90730e8
--- /dev/null
+++ b/files/image_config/eeprom-cache-clear/eeprom-cache-clear.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+## Clear EEPROM cache
+
+CACHE_ROOT="/var/cache/sonic/decode-syseeprom"
+CACHE_FILE="syseeprom_cache"
+
+mkdir -p ${CACHE_ROOT}
+rm -f ${CACHE_ROOT}/${CACHE_FILE}
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py b/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
index ef13bbd89e27..16294a17e66f 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/eeprom.py
@@ -55,7 +55,7 @@ def __init__(self):
 
         if not (os.path.exists(EEPROM_SYMLINK) \
                 or os.path.isfile(os.path.join(CACHE_ROOT, CACHE_FILE))):
-            log_error("Nowhere to read syseeprom from! No symlink or cache file found")
+            logger.log_error("Nowhere to read syseeprom from! No symlink or cache file found")
             raise RuntimeError("No syseeprom symlink or cache file found")
 
         self.eeprom_path = EEPROM_SYMLINK
@@ -66,18 +66,6 @@ def __init__(self):
 
     def _load_eeprom(self):
         cache_file = os.path.join(CACHE_ROOT, CACHE_FILE)
-        if not os.path.exists(CACHE_ROOT):
-            try:
-                os.makedirs(CACHE_ROOT)
-            except:
-                pass
-        else:
-            try:
-                # Make sure first time always read eeprom data from hardware
-                if os.path.exists(cache_file):
-                    os.remove(cache_file)
-            except Exception as e:
-                logger.log_error('Failed to remove cache file {} - {}'.format(cache_file, repr(e)))
 
         try:
             self.set_cache_name(cache_file)