diff --git a/EntityCache/Module.cs b/EntityCache/Module.cs
index f976632..0a4da61 100644
--- a/EntityCache/Module.cs
+++ b/EntityCache/Module.cs
@@ -19,9 +19,7 @@ namespace Noikoio.RegexBot.EntityCache
 
         public Module(DiscordSocketClient client) : base(client)
         {
-            _db = RegexBot.Config.Database;
-
-            if (_db.Available)
+            if (RegexBot.Config.DatabaseAvailable)
             {
                 SqlHelper.CreateCacheTablesAsync().Wait();
 
diff --git a/EntityCache/SqlHelper.cs b/EntityCache/SqlHelper.cs
index d19489c..bd666e9 100644
--- a/EntityCache/SqlHelper.cs
+++ b/EntityCache/SqlHelper.cs
@@ -19,7 +19,7 @@ namespace Noikoio.RegexBot.EntityCache
         // Reminder: Check Cache query methods if making changes to tables
         internal static async Task CreateCacheTablesAsync()
         {
-            var db = await RegexBot.Config.Database.GetOpenConnectionAsync();
+            var db = await RegexBot.Config.GetOpenDatabaseConnectionAsync();
             if (db == null) return;
             using (db)
             {
@@ -83,7 +83,7 @@ namespace Noikoio.RegexBot.EntityCache
         #region Insertions and updates
         internal static async Task UpdateGuildAsync(SocketGuild g)
         {
-            var db = await RegexBot.Config.Database.GetOpenConnectionAsync();
+            var db = await RegexBot.Config.GetOpenDatabaseConnectionAsync();
             if (db == null) return;
             using (db)
             {
@@ -109,7 +109,7 @@ namespace Noikoio.RegexBot.EntityCache
         }
         internal static async Task UpdateGuildMemberAsync(IEnumerable<SocketGuildUser> users)
         {
-            var db = await RegexBot.Config.Database.GetOpenConnectionAsync();
+            var db = await RegexBot.Config.GetOpenDatabaseConnectionAsync();
             if (db == null) return;
             using (db)
             {
diff --git a/Module/ModLogs/Entry.cs b/Module/ModLogs/Entry.cs
index 4e7918b..d09e1e3 100644
--- a/Module/ModLogs/Entry.cs
+++ b/Module/ModLogs/Entry.cs
@@ -89,7 +89,7 @@ namespace Noikoio.RegexBot.Module.ModLogs
         /// <returns>Null if no result.</returns>
         public static async Task<Entry> QueryIdAsync(ulong guild, int id)
         {
-            using (var db = await RegexBot.Config.Database.GetOpenConnectionAsync())
+            using (var db = await RegexBot.Config.GetOpenDatabaseConnectionAsync())
             {
                 using (var c = db.CreateCommand())
                 {
@@ -121,7 +121,7 @@ namespace Noikoio.RegexBot.Module.ModLogs
             }
 
             var result = new List<Entry>();
-            using (var db = await RegexBot.Config.Database.GetOpenConnectionAsync())
+            using (var db = await RegexBot.Config.GetOpenDatabaseConnectionAsync())
             {
                 using (var c = db.CreateCommand())
                 {