diff --git a/FileDbCache/UWP/Properties/AssemblyInfo.cs b/FileDbCache/UWP/Properties/AssemblyInfo.cs
index bf1edd2b..c48d0cdf 100644
--- a/FileDbCache/UWP/Properties/AssemblyInfo.cs
+++ b/FileDbCache/UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/FileDbCache/WPF/Properties/AssemblyInfo.cs b/FileDbCache/WPF/Properties/AssemblyInfo.cs
index 15c49371..4ae156a0 100644
--- a/FileDbCache/WPF/Properties/AssemblyInfo.cs
+++ b/FileDbCache/WPF/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MBTiles/UWP/Properties/AssemblyInfo.cs b/MBTiles/UWP/Properties/AssemblyInfo.cs
index a34ad764..035cd3bb 100644
--- a/MBTiles/UWP/Properties/AssemblyInfo.cs
+++ b/MBTiles/UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MBTiles/WPF/Properties/AssemblyInfo.cs b/MBTiles/WPF/Properties/AssemblyInfo.cs
index 73f09f65..3ee7a6b6 100644
--- a/MBTiles/WPF/Properties/AssemblyInfo.cs
+++ b/MBTiles/WPF/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs
index 8517f0e6..be85399d 100644
--- a/MapControl/UWP/Properties/AssemblyInfo.cs
+++ b/MapControl/UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/WPF.Core/MapControl.WPF.Core.csproj b/MapControl/WPF.Core/MapControl.WPF.Core.csproj
index fedb63f5..cd524ed3 100644
--- a/MapControl/WPF.Core/MapControl.WPF.Core.csproj
+++ b/MapControl/WPF.Core/MapControl.WPF.Core.csproj
@@ -9,11 +9,12 @@
     <DelaySign>false</DelaySign>
     <Product>XAML Map Control</Product>
     <Authors>Clemens Fischer</Authors>
-    <Version>4.14.0</Version>
+    <Version>4.15.0</Version>
     <Description>XAML Map Control Library</Description>
     <Copyright>Copyright © 2019 Clemens Fischer</Copyright>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageId>XAML.MapControl.Core</PackageId>
+    <AssemblyName>MapControl.WPF</AssemblyName>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/MapControl/WPF/Properties/AssemblyInfo.cs b/MapControl/WPF/Properties/AssemblyInfo.cs
index 04ed5b4c..a2bbc441 100644
--- a/MapControl/WPF/Properties/AssemblyInfo.cs
+++ b/MapControl/WPF/Properties/AssemblyInfo.cs
@@ -8,8 +8,8 @@ using System.Windows;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapImages/UWP/Properties/AssemblyInfo.cs b/MapImages/UWP/Properties/AssemblyInfo.cs
index 1d7df653..d4b0f49f 100644
--- a/MapImages/UWP/Properties/AssemblyInfo.cs
+++ b/MapImages/UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapImages/WPF/Properties/AssemblyInfo.cs b/MapImages/WPF/Properties/AssemblyInfo.cs
index 2da83f0f..9dcdf45d 100644
--- a/MapImages/WPF/Properties/AssemblyInfo.cs
+++ b/MapImages/WPF/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapProjections/UWP/Properties/AssemblyInfo.cs b/MapProjections/UWP/Properties/AssemblyInfo.cs
index 2cb57eb0..91d2ec49 100644
--- a/MapProjections/UWP/Properties/AssemblyInfo.cs
+++ b/MapProjections/UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapProjections/WPF/Properties/AssemblyInfo.cs b/MapProjections/WPF/Properties/AssemblyInfo.cs
index 72c53e6f..06af7262 100644
--- a/MapProjections/WPF/Properties/AssemblyInfo.cs
+++ b/MapProjections/WPF/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SQLiteCache/UWP/Properties/AssemblyInfo.cs b/SQLiteCache/UWP/Properties/AssemblyInfo.cs
index 5fbbbdea..b9381bf4 100644
--- a/SQLiteCache/UWP/Properties/AssemblyInfo.cs
+++ b/SQLiteCache/UWP/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SQLiteCache/WPF/Properties/AssemblyInfo.cs b/SQLiteCache/WPF/Properties/AssemblyInfo.cs
index 9b888f2a..c064057b 100644
--- a/SQLiteCache/WPF/Properties/AssemblyInfo.cs
+++ b/SQLiteCache/WPF/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/UniversalApp/MainPage.xaml.cs b/SampleApps/UniversalApp/MainPage.xaml.cs
index b26fa372..62ea6081 100644
--- a/SampleApps/UniversalApp/MainPage.xaml.cs
+++ b/SampleApps/UniversalApp/MainPage.xaml.cs
@@ -13,8 +13,9 @@ namespace UniversalApp
         public MainPage()
         {
             ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "XAML Map Control Test Application");
-            //TileImageLoader.Cache = new ImageFileCache(TileImageLoader.DefaultCacheFolder);
-            //TileImageLoader.Cache = new FileDbCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.FileDbCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
 
             InitializeComponent();
             DataContext = ViewModel;
diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
index be46d9d8..8e94481a 100644
--- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
+++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index 4510ea73..f68b5e4e 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -124,7 +124,7 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <map:Map x:Name="map" ZoomLevel="11" MaxZoomLevel="20"
+        <map:Map x:Name="map" ZoomLevel="11" MaxZoomLevel="21"
                  Center="{Binding MapCenter}"
                  MapLayer="{Binding MapLayers.CurrentMapLayer}"
                  MapProjection="{Binding SelectedValue, ElementName=projectionComboBox,
diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs
index 32dc79a0..6dc464d0 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml.cs
+++ b/SampleApps/WpfApplication/MainWindow.xaml.cs
@@ -14,6 +14,7 @@ namespace WpfApplication
             ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "XAML Map Control Test Application");
             //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
             //TileImageLoader.Cache = new MapControl.Caching.FileDbCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
             //TileImageLoader.Cache = null;
 
             InitializeComponent();
diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
index 7f2a1c46..b23d3883 100644
--- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("4.14.0")]
-[assembly: AssemblyFileVersion("4.14.0")]
+[assembly: AssemblyVersion("4.15.0")]
+[assembly: AssemblyFileVersion("4.15.0")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfCoreApp/MainWindow.xaml b/SampleApps/WpfCoreApp/MainWindow.xaml
index b7dddacd..05165e96 100644
--- a/SampleApps/WpfCoreApp/MainWindow.xaml
+++ b/SampleApps/WpfCoreApp/MainWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF.Core"
+        xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF"
         xmlns:vm="clr-namespace:ViewModel"
         xmlns:local="clr-namespace:WpfCoreApp"
         mc:Ignorable="d"
diff --git a/SampleApps/WpfCoreApp/MainWindow.xaml.cs b/SampleApps/WpfCoreApp/MainWindow.xaml.cs
index 05ec8412..4007acad 100644
--- a/SampleApps/WpfCoreApp/MainWindow.xaml.cs
+++ b/SampleApps/WpfCoreApp/MainWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace WpfCoreApp
         public MainWindow()
         {
             ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "XAML Map Control Test Application");
-            TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
 
             InitializeComponent();
         }
diff --git a/SampleApps/WpfCoreApp/WpfCoreApp.csproj b/SampleApps/WpfCoreApp/WpfCoreApp.csproj
index ce9b250a..48ef2569 100644
--- a/SampleApps/WpfCoreApp/WpfCoreApp.csproj
+++ b/SampleApps/WpfCoreApp/WpfCoreApp.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <RootNamespace>WpfCoreApp</RootNamespace>
-    <Version>4.14.0</Version>
+    <Version>4.15.0</Version>
     <Authors>Clemens Fischer</Authors>
     <Product>XAML Map Control</Product>
   </PropertyGroup>