diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ebec3f5..2a3c327 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,6 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.100-preview1-014459
+        dotnet-version: 3.1.100-preview3-014645
     - name: Build
       run: dotnet build --configuration Release
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 302ca10..30aec0c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.100-preview1-014459
+        dotnet-version: 3.1.100-preview3-014645
     - name: Build
       run: dotnet build --configuration Release
     - name: Pack
diff --git a/src/Blazor.Extensions.Storage/Blazor.Extensions.Storage.csproj b/src/Blazor.Extensions.Storage/Blazor.Extensions.Storage.csproj
index acd3445..d2132c7 100644
--- a/src/Blazor.Extensions.Storage/Blazor.Extensions.Storage.csproj
+++ b/src/Blazor.Extensions.Storage/Blazor.Extensions.Storage.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0-preview1.19508.20" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0-preview3.19555.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blazor.Extensions.Storage/Interfaces/ILocalStorage.cs b/src/Blazor.Extensions.Storage/Interfaces/ILocalStorage.cs
new file mode 100644
index 0000000..3bf2397
--- /dev/null
+++ b/src/Blazor.Extensions.Storage/Interfaces/ILocalStorage.cs
@@ -0,0 +1,4 @@
+namespace Blazor.Extensions.Storage.Interfaces
+{
+    public interface ILocalStorage : IStorage {}
+}
diff --git a/src/Blazor.Extensions.Storage/Interfaces/ISessionStorage.cs b/src/Blazor.Extensions.Storage/Interfaces/ISessionStorage.cs
new file mode 100644
index 0000000..83e6142
--- /dev/null
+++ b/src/Blazor.Extensions.Storage/Interfaces/ISessionStorage.cs
@@ -0,0 +1,4 @@
+namespace Blazor.Extensions.Storage.Interfaces
+{
+    public interface ISessionStorage : IStorage {}
+}
diff --git a/src/Blazor.Extensions.Storage/LocalStorage.cs b/src/Blazor.Extensions.Storage/LocalStorage.cs
index 321f6f4..75f60d9 100644
--- a/src/Blazor.Extensions.Storage/LocalStorage.cs
+++ b/src/Blazor.Extensions.Storage/LocalStorage.cs
@@ -5,7 +5,7 @@
 
 namespace Blazor.Extensions.Storage
 {
-    public class LocalStorage : IStorage
+    internal class LocalStorage : ILocalStorage
     {
         private readonly IJSRuntime runtime;
 
diff --git a/src/Blazor.Extensions.Storage/SessionStorage.cs b/src/Blazor.Extensions.Storage/SessionStorage.cs
index 71e83ec..178676a 100644
--- a/src/Blazor.Extensions.Storage/SessionStorage.cs
+++ b/src/Blazor.Extensions.Storage/SessionStorage.cs
@@ -5,7 +5,7 @@
 
 namespace Blazor.Extensions.Storage
 {
-    public class SessionStorage : IStorage
+    internal class SessionStorage : ISessionStorage
     {
         private readonly IJSRuntime runtime;
 
diff --git a/src/Blazor.Extensions.Storage/StorageExtensions.cs b/src/Blazor.Extensions.Storage/StorageExtensions.cs
index 36001e1..7160a25 100644
--- a/src/Blazor.Extensions.Storage/StorageExtensions.cs
+++ b/src/Blazor.Extensions.Storage/StorageExtensions.cs
@@ -1,3 +1,4 @@
+using Blazor.Extensions.Storage.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Blazor.Extensions.Storage
@@ -6,8 +7,8 @@ public static class StorageExtensions
     {
         public static IServiceCollection AddStorage(this IServiceCollection services)
         {
-            return services.AddScoped<SessionStorage>()
-                .AddScoped<LocalStorage>();
+            return services.AddScoped<ISessionStorage, SessionStorage>()
+                .AddScoped<ILocalStorage, LocalStorage>();
         }
     }
 }
diff --git a/test/Blazor.Extensions.Storage.Test/Blazor.Extensions.Storage.Test.csproj b/test/Blazor.Extensions.Storage.Test/Blazor.Extensions.Storage.Test.csproj
index a844bd1..ef0b929 100644
--- a/test/Blazor.Extensions.Storage.Test/Blazor.Extensions.Storage.Test.csproj
+++ b/test/Blazor.Extensions.Storage.Test/Blazor.Extensions.Storage.Test.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview1.19508.20" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview1.19508.20" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview1.19508.20" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.1.0-preview3.19555.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.1.0-preview3.19555.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.1.0-preview3.19555.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.1.0-preview3.19555.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Blazor.Extensions.Storage.Test/Pages/Index.razor b/test/Blazor.Extensions.Storage.Test/Pages/Index.razor
index 211e5ad..b7f7099 100644
--- a/test/Blazor.Extensions.Storage.Test/Pages/Index.razor
+++ b/test/Blazor.Extensions.Storage.Test/Pages/Index.razor
@@ -1,9 +1,10 @@
 @page "/"
-@inject SessionStorage SessionStorage
-@inject LocalStorage LocalStorage
+@inject ISessionStorage SessionStorage
+@inject ILocalStorage LocalStorage
 @inject HttpClient Http
 @inject InteropStorage  InteropStorage
 @inject IJSRuntime JSRuntime
+@using Blazor.Extensions.Storage.Interfaces
 @using Blazor.Extensions.Storage.Test.Interop
 
 <h1>Test logging output:  (See debugger log for full output)</h1>