diff --git a/samples/BlazorServer/Startup.cs b/samples/BlazorServer/Startup.cs
index afb1033..2e8b1f0 100644
--- a/samples/BlazorServer/Startup.cs
+++ b/samples/BlazorServer/Startup.cs
@@ -8,6 +8,7 @@
 using Blazored.SessionStorage.Serialization;
 using Newtonsoft.Json;
 using System;
+using System.Threading.Tasks;
 
 namespace BlazorServer
 {
@@ -62,7 +63,17 @@ public class NewtonSoftJsonSerializer : IJsonSerializer
         public T Deserialize<T>(string text) 
             =>JsonConvert.DeserializeObject<T>(text);
 
+        public async Task<T> DeserializeAsync<T>(string text)
+        {
+            return await Task.Run(() => JsonConvert.DeserializeObject<T>(text));
+        }
+
         public string Serialize<T>(T obj) 
             => JsonConvert.SerializeObject(obj);
+
+        public async Task<string> SerializeAsync<T>(T obj)
+        {
+            return await Task.Run(() => JsonConvert.SerializeObject(obj))
+;        }
     }
 }
diff --git a/src/Blazored.SessionStorage/Blazored - Backup.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored - Backup.SessionStorage.csproj
new file mode 100644
index 0000000..c473355
--- /dev/null
+++ b/src/Blazored.SessionStorage/Blazored - Backup.SessionStorage.csproj	
@@ -0,0 +1,68 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Authors>Chris Sainty</Authors>
+    <Company></Company>
+    <Copyright>Copyright 2020 (c) Chris Sainty. All rights reserved.</Copyright> 
+    <Description>A library to provide access to session storage in Blazor applications</Description>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!-- NuGet settings -->
+    <PackageId>Blazored.SessionStorage</PackageId>
+    <PackageTags>Blazored;Blazor;Razor;Components;SessionStorage;Session Storage;ASP.NET Core;CSharp;Web</PackageTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/Blazored/SessionStorage</PackageProjectUrl>
+    <PackageIcon>icon.png</PackageIcon>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Blazored/SessionStorage</RepositoryUrl>
+
+    <!-- SourceLink settings -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Blazored.SessionStorage.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <RazorLangVersion>3.0</RazorLangVersion>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet3Version)" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet5Version)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="icon.png" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>
+        Blazored.SessionStorage.TestExtensions, PublicKey=00240000048000009400000006020000002400005253413100040000010001007527e122cc36dc13c695a4f43b7c2da3f631aed456ed309140c0d52262323e25d84bef7feddc8bd29cfe46ec652186cb10e059eedabf2ff000b977a2376a613dccfb092de6c243e0888db4c66a084124b2c1799bda4bbb2f70fed0382fc1cbdafa6dc0f4baccdc2cee55234f8a5ad76645c315523fee5352d9f01036e48b13e3
+      </_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>
+        Blazored.SessionStorage.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007527e122cc36dc13c695a4f43b7c2da3f631aed456ed309140c0d52262323e25d84bef7feddc8bd29cfe46ec652186cb10e059eedabf2ff000b977a2376a613dccfb092de6c243e0888db4c66a084124b2c1799bda4bbb2f70fed0382fc1cbdafa6dc0f4baccdc2cee55234f8a5ad76645c315523fee5352d9f01036e48b13e3
+      </_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj
index 194b03e..40d4ab8 100644
--- a/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj
+++ b/src/Blazored.SessionStorage/Blazored.SessionStorage.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
-
+    <TargetFramework>net7.0</TargetFramework>
     <Authors>Chris Sainty</Authors>
     <Company></Company>
     <Copyright>Copyright 2020 (c) Chris Sainty. All rights reserved.</Copyright> 
@@ -62,4 +61,10 @@
     </AssemblyAttribute>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="Microsoft.JSInterop" Version="7.0.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs b/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs
index 9bccf18..7f4169a 100644
--- a/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs
+++ b/src/Blazored.SessionStorage/Serialization/IJsonSerializer.cs
@@ -1,8 +1,12 @@
+using System.Threading.Tasks;
+
 namespace Blazored.SessionStorage.Serialization
 {
     public interface IJsonSerializer
     {
         string Serialize<T>(T obj);
         T Deserialize<T>(string text);
+        ValueTask<string> SerializeAsync<T>(T obj);
+        ValueTask<T> DeserializeAsync<T>(string text);
     }
 }
diff --git a/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs
index 5ce56c0..5e972cc 100644
--- a/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs
+++ b/src/Blazored.SessionStorage/Serialization/SystemTextJsonSerializer.cs
@@ -1,6 +1,8 @@
 using Blazored.SessionStorage.StorageOptions;
 using Microsoft.Extensions.Options;
+using System.IO;
 using System.Text.Json;
+using System.Threading.Tasks;
 
 namespace Blazored.SessionStorage.Serialization
 {
@@ -23,5 +25,32 @@ public T Deserialize<T>(string data)
 
         public string Serialize<T>(T data)
             => JsonSerializer.Serialize(data, _options);
+
+        public async ValueTask<string> SerializeAsync<T>(T data)
+        {
+            using (var stream = new MemoryStream())
+            {
+                await JsonSerializer.SerializeAsync(stream, data, data.GetType());
+                stream.Position = 0;
+                using var reader = new StreamReader(stream);
+                return await reader.ReadToEndAsync();
+            }
+        }
+
+        public async ValueTask<T> DeserializeAsync<T>(string data)
+        {
+            var strm = await ToStream(data);
+            return await JsonSerializer.DeserializeAsync<T>(strm);
+        }
+
+        private async ValueTask<Stream> ToStream(string str)
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            await writer.WriteAsync(str);
+            await writer.FlushAsync();
+            stream.Position = 0;
+            return stream;
+        }
     }
 }
diff --git a/src/Blazored.SessionStorage/SessionStorageService.cs b/src/Blazored.SessionStorage/SessionStorageService.cs
index d020994..60f8d26 100644
--- a/src/Blazored.SessionStorage/SessionStorageService.cs
+++ b/src/Blazored.SessionStorage/SessionStorageService.cs
@@ -27,7 +27,7 @@ public async ValueTask SetItemAsync<T>(string key, T data, CancellationToken? ca
             if (e.Cancel)
                 return;
 
-            var serialisedData = _serializer.Serialize(data);
+            var serialisedData = await _serializer.SerializeAsync(data);
             await _storageProvider.SetItemAsync(key, serialisedData, cancellationToken).ConfigureAwait(false);
 
             RaiseOnChanged(key, e.OldValue, data);
@@ -63,7 +63,7 @@ public async ValueTask<T> GetItemAsync<T>(string key, CancellationToken? cancell
 
             try
             {
-                return _serializer.Deserialize<T>(serialisedData);
+                return await _serializer.DeserializeAsync<T>(serialisedData);
             }
             catch (JsonException e) when (e.Path == "$" && typeof(T) == typeof(string))
             {
@@ -225,7 +225,7 @@ private async Task<T> GetItemInternalAsync<T>(string key)
                 return default;
             try
             {
-                return _serializer.Deserialize<T>(serialisedData);
+                return await _serializer.DeserializeAsync<T>(serialisedData);
             }
             catch (JsonException)
             {