diff --git a/src/TypeCache/Data/DataSource.cs b/src/TypeCache/Data/DataSource.cs
index 010bcc4b..56c71bea 100644
--- a/src/TypeCache/Data/DataSource.cs
+++ b/src/TypeCache/Data/DataSource.cs
@@ -26,13 +26,13 @@ public DataSource(string name, DbProviderFactory dbProviderFactory, string conne
 		this.Server = connection.DataSource;
 		this.Version = connection.ServerVersion;
 
-		var @namespace = dbProviderFactory.GetType().Namespace;
+		var @namespace = dbProviderFactory.GetType().Namespace ?? string.Empty;
 		this.Type = @namespace switch
 		{
-			_ when @namespace.Is("Microsoft.Data.SqlClient") || @namespace.Is("System.Data.SqlClient") => DataSourceType.SqlServer,
-			_ when @namespace.Is("Oracle.DataAccess.Client") => DataSourceType.Oracle,
-			_ when @namespace.Is("Npgsql") => DataSourceType.PostgreSql,
-			_ when @namespace.Is("MySql.Data.MySqlClient") => DataSourceType.MySql,
+			_ when @namespace.Has("SqlClient") => DataSourceType.SqlServer,
+			_ when @namespace.Has("Oracle") => DataSourceType.Oracle,
+			_ when @namespace.Is("Npgsql") || @namespace.Has("Postgre") => DataSourceType.PostgreSql,
+			_ when @namespace.Has("MySql") => DataSourceType.MySql,
 			_ => DataSourceType.Unknown
 		};
 
diff --git a/src/TypeCache/TypeCache.csproj b/src/TypeCache/TypeCache.csproj
index 70c962e8..3a0248f5 100644
--- a/src/TypeCache/TypeCache.csproj
+++ b/src/TypeCache/TypeCache.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>TypeCache</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageId>TypeCache</PackageId>
-    <Version>8.1.1</Version>
+    <Version>8.1.2</Version>
     <Authors>Samuel Abraham &lt;sam987883@gmail.com&gt;</Authors>
     <Company>Samuel Abraham &lt;sam987883@gmail.com&gt;</Company>
     <Title>TypeCache Reflection</Title>