diff --git a/FileDbCache/WinUI/FileDbCache.WinUI.csproj b/FileDbCache/WinUI/FileDbCache.WinUI.csproj
new file mode 100644
index 00000000..3f4e61eb
--- /dev/null
+++ b/FileDbCache/WinUI/FileDbCache.WinUI.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net5.0-windows10.0.19041</TargetFramework>
+        <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+        <RootNamespace>MapControl.Caching</RootNamespace>
+        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
+        <DelaySign>false</DelaySign>
+        <Product>XAML Map Control</Product>
+        <Version>6.0.0</Version>
+        <Description>IImageCache implementation based on EzTools FileDb</Description>
+        <Authors>Clemens Fischer</Authors>
+        <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <UseWinUI>true</UseWinUI>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="..\..\MapControl.snk" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Shared\*.cs" />
+        <Compile Include="..\UWP\*.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="FileDb.Standard" Version="7.4.4" />
+        <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
+        <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0" />
+        <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\MapControl\WinUI\MapControl.WinUI.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/MapControlExtended.sln b/MapControlExtended.sln
index 9b94de2d..bf2165d3 100644
--- a/MapControlExtended.sln
+++ b/MapControlExtended.sln
@@ -51,6 +51,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUiApp", "SampleApps\WinU
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "WinUiApp (Package)", "SampleApps\WinUiApp (Package)\WinUiApp (Package).wapproj", "{2DB6959F-1768-495C-8EED-4830EF185584}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileDbCache.WinUI", "FileDbCache\WinUI\FileDbCache.WinUI.csproj", "{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLiteCache.WinUI", "SQLiteCache\WinUI\SQLiteCache.WinUI.csproj", "{E33FC359-F713-462C-8A8E-7EEA15E36BE1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -197,6 +201,22 @@ Global
 		{2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.ActiveCfg = Release|x64
 		{2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.Build.0 = Release|x64
 		{2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.Deploy.0 = Release|x64
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|x64.Build.0 = Debug|Any CPU
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|x64.ActiveCfg = Release|Any CPU
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|x64.Build.0 = Release|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|x64.Build.0 = Debug|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x64.ActiveCfg = Release|Any CPU
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -219,6 +239,8 @@ Global
 		{ACA8E56C-0F82-4010-A83E-2DBFF5D16919} = {52AECE49-F314-4F76-98F2-FA800F07824B}
 		{66C8D0B6-1D19-4023-9A8B-C7E41857EB73} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC}
 		{2DB6959F-1768-495C-8EED-4830EF185584} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC}
+		{DFE09FD5-530D-48AB-8A46-4611F21BBBC3} = {261905DE-9653-4567-B498-1F46BEA2A4F3}
+		{E33FC359-F713-462C-8A8E-7EEA15E36BE1} = {96FD1258-1597-48A2-8D64-1ADAE13E886A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB}
diff --git a/SQLiteCache/UWP/SQLiteCache.UWP.csproj b/SQLiteCache/UWP/SQLiteCache.UWP.csproj
index 36aba29a..74ead7d8 100644
--- a/SQLiteCache/UWP/SQLiteCache.UWP.csproj
+++ b/SQLiteCache/UWP/SQLiteCache.UWP.csproj
@@ -52,7 +52,7 @@
       <Version>6.2.12</Version>
     </PackageReference>
     <PackageReference Include="System.Data.SQLite.Core">
-      <Version>1.0.114.2</Version>
+      <Version>1.0.114.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
index 3321e7e3..b66e2f24 100644
--- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj
+++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
@@ -46,6 +46,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.2" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
     </ItemGroup>
 </Project>
diff --git a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
new file mode 100644
index 00000000..a2a527ce
--- /dev/null
+++ b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net5.0-windows10.0.19041</TargetFramework>
+        <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+        <RootNamespace>MapControl.Caching</RootNamespace>
+        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
+        <DelaySign>false</DelaySign>
+        <Product>XAML Map Control</Product>
+        <Version>6.0.0</Version>
+        <Description>IImageCache implementation based on SQLite</Description>
+        <Authors>Clemens Fischer</Authors>
+        <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <UseWinUI>true</UseWinUI>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="..\..\MapControl.snk" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Shared\*.cs" />
+        <Compile Include="..\UWP\*.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
+        <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0" />
+        <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.114.3" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\MapControl\WinUI\MapControl.WinUI.csproj" />
+    </ItemGroup>
+</Project>