diff --git a/lib/entropy/client/interfaces/dep.py b/lib/entropy/client/interfaces/dep.py
index a87c9004b..c577d653f 100644
--- a/lib/entropy/client/interfaces/dep.py
+++ b/lib/entropy/client/interfaces/dep.py
@@ -187,7 +187,7 @@ class CalculatorsMixin:
             sha = hashlib.sha1()
 
             cache_fmt = "a{%s}mr{%s}ms{%s}rh{%s}mf{%s}"
-            cache_fmt += "er{%s}ar{%s}m{%s}s{%s;%s;%s}"
+            cache_fmt += "er{%s}ar{%s}m{%s}cm{%s}s{%s;%s;%s}"
             cache_s = cache_fmt % (
                 atom,
                 ";".join(match_repo),
@@ -197,6 +197,7 @@ class CalculatorsMixin:
                 ";".join(self._enabled_repos),
                 ";".join(sorted(self._settings['repositories']['available'])),
                 self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
                 multi_match,
                 multi_repo,
                 extended_results)
@@ -367,12 +368,13 @@ class CalculatorsMixin:
         if self.xcache and use_cache:
             sha = hashlib.sha1()
 
-            cache_s = "k{%s}re{%s}de{%s}rh{%s}m{%s}er{%s}ar{%s}" % (
+            cache_s = "k{%s}re{%s}de{%s}rh{%s}m{%s}cm{%s}er{%s}ar{%s}" % (
                 keyword,
                 ";".join(repositories),
                 description,
                 self._all_repositories_hash(),
                 self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
                 ";".join(sorted(self._settings['repositories']['available'])),
                 )
@@ -645,12 +647,13 @@ class CalculatorsMixin:
         if self.xcache:
             sha = hashlib.sha1()
 
-            cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|v5" % (
+            cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|v6" % (
                 ";".join(sorted(dependencies)),
                 deep_deps,
                 inst_repo.checksum(),
                 self._all_repositories_hash(),
                 self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
                 ";".join(sorted(self._settings['repositories']['available'])),
                 relaxed_deps,
@@ -1876,12 +1879,13 @@ class CalculatorsMixin:
         cache_key = None
 
         if self.xcache:
-            cache_s = "%s|%s|%s|%s|%s|%s|%s|r5" % (
+            cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|r6" % (
                 match,
                 installed_package_id,
                 inst_repo.checksum(),
                 self._all_repositories_hash(),
                 self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
                 ";".join(sorted(self._settings['repositories']['available'])),
             )
@@ -2161,7 +2165,7 @@ class CalculatorsMixin:
         if self.xcache:
             sha = hashlib.sha1()
 
-            cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|v5" % (
+            cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|v6" % (
                 ";".join(["%s" % (x,) for x in sorted(package_matches)]),
                 empty_deps,
                 deep_deps,
@@ -2172,6 +2176,7 @@ class CalculatorsMixin:
                 inst_repo.checksum(),
                 self._all_repositories_hash(),
                 self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(sorted(self._settings['repositories']['available'])),
                 # needed when users do bogus things like editing config files
                 # manually (branch setting)
@@ -2439,7 +2444,7 @@ class CalculatorsMixin:
         if self.xcache:
             sha = hashlib.sha1()
 
-            cache_s = "ma{%s}s{%s;%s;%s;%s;%s;%s;%s;%s;%s;%s}v3" % (
+            cache_s = "ma{%s}s{%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s}v4" % (
                 ";".join(["%s" % (x,) for x in sorted(matched_atoms)]),
                 deep,
                 recursive,
@@ -2449,6 +2454,7 @@ class CalculatorsMixin:
                 inst_repo.checksum(),
                 self._all_repositories_hash(),
                 self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
                 ";".join(sorted(self._settings['repositories']['available'])),
                 )
@@ -2977,12 +2983,13 @@ class CalculatorsMixin:
 
         inst_repo = self.installed_repository()
 
-        cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|v3" % (
+        cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|v4" % (
             self._repositories_hash(),
             enabled_repos,
             inst_repo.checksum(),
             self._all_repositories_hash(),
             self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
             ";".join(sorted(self._settings['repositories']['available'])),
             repo_order,
             # needed when users do bogus things like editing config files
@@ -3120,13 +3127,14 @@ class CalculatorsMixin:
         repo_order = [x for x in self._settings['repositories']['order'] if
                       x in enabled_repos]
 
-        cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|v5" % (
+        cache_s = "%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|v6" % (
             self._repositories_hash(),
             empty,
             enabled_repos,
             inst_repo.checksum(),
             self._all_repositories_hash(),
             self._settings.packages_configuration_hash(),
+            self._settings_client_plugin.packages_configuration_hash(),
             ";".join(sorted(self._settings['repositories']['available'])),
             repo_order,
             ignore_spm_downgrades,
@@ -3528,12 +3536,13 @@ class CalculatorsMixin:
         if self.xcache:
             sha = hashlib.sha1()
 
-            cache_s = "{%s;%s;%s;%s;%s;%s;%s}v3" % (
+            cache_s = "{%s;%s;%s;%s;%s;%s;%s;%s}v4" % (
                 atom,
                 deep,
                 inst_repo.checksum(),
                 self._all_repositories_hash(),
                 self._settings.packages_configuration_hash(),
+                self._settings_client_plugin.packages_configuration_hash(),
                 ";".join(self._enabled_repos),
                 ";".join(sorted(self._settings['repositories']['available'])),
                 )