diff --git a/libraries/entropy/client/interfaces/db.py b/libraries/entropy/client/interfaces/db.py
index 0f15eb0d9..2b601787b 100644
--- a/libraries/entropy/client/interfaces/db.py
+++ b/libraries/entropy/client/interfaces/db.py
@@ -37,8 +37,9 @@ from entropy.core.settings.base import SystemSettings
 
 import entropy.tools
 
-__all__ = ["ClientEntropyRepositoryPlugin", "InstalledPackagesRepository",
-    "AvailablePackagesRepository", "GenericRepository"]
+__all__ = ["CachedRepository", "ClientEntropyRepositoryPlugin",
+    "InstalledPackagesRepository", "AvailablePackagesRepository",
+    "GenericRepository"]
 
 class ClientEntropyRepositoryPlugin(EntropyRepositoryPlugin):
 
diff --git a/libraries/entropy/server/interfaces/db.py b/libraries/entropy/server/interfaces/db.py
index a2e52426b..e59fb6a5a 100644
--- a/libraries/entropy/server/interfaces/db.py
+++ b/libraries/entropy/server/interfaces/db.py
@@ -33,6 +33,7 @@ from entropy.misc import RSS
 from entropy.cache import EntropyCacher
 from entropy.exceptions import OnlineMirrorError
 from entropy.security import Repository as RepositorySecurity
+from entropy.client.interfaces.db import CachedRepository
 from entropy.i18n import _
 
 from entropy.server.interfaces.rss import ServerRssMetadata
@@ -165,7 +166,7 @@ class ServerRepositoryStatus(Singleton):
         return self.__updates_log[db]
 
 
-class ServerPackagesRepository(EntropyRepository):
+class ServerPackagesRepository(CachedRepository):
     """
     This class represents the installed packages repository and is a direct
     subclass of EntropyRepository.