diff --git a/custom_components/omnik_inverter/manifest.json b/custom_components/omnik_inverter/manifest.json
index 48a7a29..79b80fa 100644
--- a/custom_components/omnik_inverter/manifest.json
+++ b/custom_components/omnik_inverter/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "omnik_inverter",
   "name": "Omnik Inverter",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "documentation": "https://github.com/robbinjanssen/home-assistant-omnik-inverter",
   "dependencies": [],
   "codeowners": [
diff --git a/custom_components/omnik_inverter/sensor.py b/custom_components/omnik_inverter/sensor.py
index eae61d7..abb58c9 100644
--- a/custom_components/omnik_inverter/sensor.py
+++ b/custom_components/omnik_inverter/sensor.py
@@ -27,7 +27,7 @@
 
 import re
 
-VERSION = '1.5.3'
+VERSION = '1.5.4'
 
 CONF_CACHE_POWER_TODAY = 'cache_power_today'
 CONF_USE_JSON = 'use_json'
@@ -36,7 +36,7 @@
 
 JS_URL = 'http://{0}/js/status.js'
 JSON_URL = 'http://{0}/status.json?CMD=inv_query&rand={1}'
-CACHE_NAME = '.{0}.json'
+CACHE_NAME = '.{0}{1}.json'
 CACHE_VALUE_KEY = "cache_value"
 CACHE_DAY_KEY = "cache_day"
 
@@ -183,7 +183,7 @@ def __init__(self, data, sensor_type, name, cache, cache_name):
 
         # Set caching data.
         self._cache = cache
-        self._cache_name = cache_name.format(self._type)
+        self._cache_name = cache_name.format(name, self._type)
 
         # Trigger an update to get the unique ID.
         self.update()