diff --git a/jarvis/cogs/extra/rolegiver.py b/jarvis/cogs/extra/rolegiver.py
index 6e46e35..7ccd426 100644
--- a/jarvis/cogs/extra/rolegiver.py
+++ b/jarvis/cogs/extra/rolegiver.py
@@ -95,6 +95,12 @@ class RolegiverCog(Extension):
         await rolegiver.save()
 
         await ctx.send(f"Rolegiver group {group} created!")
+        
+        if ctx.guild.id not in self._group_cache:
+            self._group_cache[ctx.guild.id] = {rolegiver.group: {}}
+        elif rolegiver.group not in self._group_cache[ctx.guild.id]:
+            self._group_cache[ctx.guild.id][rolegiver.group] = {}
+        
 
     @rg_group.subcommand(
         sub_cmd_name="delete", sub_cmd_description="DDelete a rolegiver group"
@@ -113,6 +119,7 @@ class RolegiverCog(Extension):
         ):
             await rolegiver.delete()
             await ctx.send(f"Rolegiver group {group} deleted!")
+            del self._group_cache[ctx.guild.id][rolegiver.group]
         else:
             await ctx.send(f"Rolegiver group {group} does not exist!", ephemeral=True)
 
@@ -304,7 +311,9 @@ class RolegiverCog(Extension):
         required=False,
         autocomplete=True,
     )
-    async def _rolegiver_list(self, ctx: InteractionContext, group: str = None) -> None:
+    async def _rolegiver_list(
+        self, ctx: InteractionContext, group: str = "Default"
+    ) -> None:
         setting = await Rolegiver.find_one(
             Rolegiver.guild == ctx.guild.id, Rolegiver.group == group
         )
@@ -553,7 +562,7 @@ class RolegiverCog(Extension):
     @_rolegiver_remove.autocomplete("group")
     @_rolegiver_list.autocomplete("group")
     async def _autocomplete_group(self, ctx: AutocompleteContext):
-        groups = list(self._group_cache.get(ctx.guild.id).keys())
+        groups = list(self._group_cache.get(ctx.guild.id, {}).keys())
         if not groups:
             rolegivers = await Rolegiver.find(Rolegiver.guild == ctx.guild.id).to_list()
             groups = [r.group for r in rolegivers]
diff --git a/pyproject.toml b/pyproject.toml
index d72e86e..e292284 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jarvis"
-version = "2.5.0"
+version = "2.5.1"
 description = "JARVIS admin bot"
 authors = ["Zevaryx <zevaryx@gmail.com>"]