diff --git a/libraries/entropy/client/interfaces/cache.py b/libraries/entropy/client/interfaces/cache.py
index 7d87603cc..5928b3525 100644
--- a/libraries/entropy/client/interfaces/cache.py
+++ b/libraries/entropy/client/interfaces/cache.py
@@ -198,13 +198,8 @@ class CacheMixin:
                     ignore_spm_downgrades),)
 
             disk_cache = self.Cacher.pop(c_hash)
-            if disk_cache != None:
-                try:
-                    # workaround for old cache
-                    if len(disk_cache['r']) == 4:
-                        return disk_cache['r']
-                except (KeyError, TypeError):
-                    return None
+            if isinstance(disk_cache, tuple):
+                return disk_cache
 
     def get_world_update_cache_hash(self, db_digest, empty_deps,
         ignore_spm_downgrades):
diff --git a/libraries/entropy/client/interfaces/dep.py b/libraries/entropy/client/interfaces/dep.py
index b3842c451..515b6d64b 100644
--- a/libraries/entropy/client/interfaces/dep.py
+++ b/libraries/entropy/client/interfaces/dep.py
@@ -1605,10 +1605,7 @@ class CalculatorsMixin:
         if self.xcache:
             c_hash = self.get_world_update_cache_hash(db_digest, empty_deps,
                 ignore_spm_downgrades)
-            data = {
-                'r': (update, remove, fine, spm_fine,),
-                'empty_deps': empty_deps,
-            }
+            data = (update, remove, fine, spm_fine,)
             self.Cacher.push("%s%s" % (etpCache['world_update'],c_hash,),
                 data, async = False)