diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5604a34..90c6e3d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -8,10 +8,10 @@
 	<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
 	<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
 	<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
-	<PackageVersion Include="Immediate.Handlers" Version="2.0.0" />
+	<PackageVersion Include="Immediate.Handlers" Version="2.1.0" />
 	<PackageVersion Include="MinVer" Version="6.0.0" />
-	<PackageVersion Include="TUnit.Engine" Version="0.13.9" />
-	<PackageVersion Include="xunit.v3.assert" Version="1.1.0" />
+	<PackageVersion Include="TUnit.Engine" Version="0.19.86" />
+	<PackageVersion Include="xunit.v3.assert" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
@@ -22,14 +22,14 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net9.0'">
-	<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.2" />
-	<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2" />
-	<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
-	<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
+	<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.4" />
+	<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
+	<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+	<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>
 	<GlobalPackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="All" />
-	<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.188" PrivateAssets="All" />
+	<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.197" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Immediate.Cache.sln b/Immediate.Cache.sln
deleted file mode 100644
index cca9179..0000000
--- a/Immediate.Cache.sln
+++ /dev/null
@@ -1,59 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.12.35424.110
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{93B13403-10EA-4154-9CB6-295EC0AC3E43}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitignore = .gitignore
-		.github\dependabot.yml = .github\dependabot.yml
-		Directory.Build.props = Directory.Build.props
-		Directory.Packages.props = Directory.Packages.props
-		readme.md = readme.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{EE4331A2-6EFB-4A06-BBC7-2CB1EF727A0B}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\build.yml = .github\workflows\build.yml
-		.github\workflows\release.yml = .github\workflows\release.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{0605CACA-CA43-4BA1-9770-EB6A8B270B92}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8E519ACA-C2E6-4D20-B07C-77768D3CE2C9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immediate.Cache.Shared", "src\Immediate.Cache.Shared\Immediate.Cache.Shared.csproj", "{F985DA04-8AF8-44D3-B0C6-88ED2C01B4BB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immediate.Cache", "src\Immediate.Cache\Immediate.Cache.csproj", "{21576D29-A440-4162-B6CF-B2A02AFF19BE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immediate.Cache.FunctionalTests", "tests\Immediate.Cache.FunctionalTests\Immediate.Cache.FunctionalTests.csproj", "{E9EFE29C-735A-4B73-B708-DF1455CE9424}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F985DA04-8AF8-44D3-B0C6-88ED2C01B4BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F985DA04-8AF8-44D3-B0C6-88ED2C01B4BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F985DA04-8AF8-44D3-B0C6-88ED2C01B4BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F985DA04-8AF8-44D3-B0C6-88ED2C01B4BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21576D29-A440-4162-B6CF-B2A02AFF19BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21576D29-A440-4162-B6CF-B2A02AFF19BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21576D29-A440-4162-B6CF-B2A02AFF19BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21576D29-A440-4162-B6CF-B2A02AFF19BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9EFE29C-735A-4B73-B708-DF1455CE9424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9EFE29C-735A-4B73-B708-DF1455CE9424}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9EFE29C-735A-4B73-B708-DF1455CE9424}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9EFE29C-735A-4B73-B708-DF1455CE9424}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EE4331A2-6EFB-4A06-BBC7-2CB1EF727A0B} = {93B13403-10EA-4154-9CB6-295EC0AC3E43}
-		{F985DA04-8AF8-44D3-B0C6-88ED2C01B4BB} = {0605CACA-CA43-4BA1-9770-EB6A8B270B92}
-		{21576D29-A440-4162-B6CF-B2A02AFF19BE} = {0605CACA-CA43-4BA1-9770-EB6A8B270B92}
-		{E9EFE29C-735A-4B73-B708-DF1455CE9424} = {8E519ACA-C2E6-4D20-B07C-77768D3CE2C9}
-	EndGlobalSection
-EndGlobal
diff --git a/Immediate.Cache.slnx b/Immediate.Cache.slnx
new file mode 100644
index 0000000..c80f1b3
--- /dev/null
+++ b/Immediate.Cache.slnx
@@ -0,0 +1,21 @@
+<Solution>
+  <Folder Name="/.root/">
+    <File Path=".editorconfig" />
+    <File Path=".github/dependabot.yml" />
+    <File Path=".gitignore" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="readme.md" />
+  </Folder>
+  <Folder Name="/.root/workflows/">
+    <File Path=".github/workflows/build.yml" />
+    <File Path=".github/workflows/release.yml" />
+  </Folder>
+  <Folder Name="/Source/">
+    <Project Path="src/Immediate.Cache.Shared/Immediate.Cache.Shared.csproj" />
+    <Project Path="src/Immediate.Cache/Immediate.Cache.csproj" />
+  </Folder>
+  <Folder Name="/Tests/">
+    <Project Path="tests/Immediate.Cache.FunctionalTests/Immediate.Cache.FunctionalTests.csproj" />
+  </Folder>
+</Solution>