Improved caching and utils structure

classes/pycord_guild.py

@@ -8,7 +8,7 @@ from pymongo.results import InsertOneResult
 
 from classes.errors import GuildNotFoundError
 from modules.database import col_guilds
-from modules.logging_utils import get_logger
+from modules.utils import get_logger, restore_from_cache
 
 logger: Logger = get_logger(__name__)
 
@@ -45,11 +45,10 @@ class PycordGuild:
         Raises:
              GuildNotFoundError: User was not found and creation was not allowed
         """
-        if cache is not None:
-            cached_entry: Dict[str, Any] | None = cache.get_json(f"{cls.__short_name__}_{guild_id}")
+        cached_entry: Dict[str, Any] | None = restore_from_cache(cls.__short_name__, guild_id, cache=cache)
 
-            if cached_entry is not None:
-                return cls(**cached_entry)
+        if cached_entry is not None:
+            return cls(**cached_entry)
 
         db_entry = await cls.__collection__.find_one({"id": guild_id})