Index: Core/Components/src/Core.Components.BruTile.Data/Core.Components.BruTile.Data.csproj
===================================================================
diff -u -rd993e5ebe5851ea9c65753d8709d73a926a24afd -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.BruTile.Data/Core.Components.BruTile.Data.csproj	(.../Core.Components.BruTile.Data.csproj)	(revision d993e5ebe5851ea9c65753d8709d73a926a24afd)
+++ Core/Components/src/Core.Components.BruTile.Data/Core.Components.BruTile.Data.csproj	(.../Core.Components.BruTile.Data.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
Index: Core/Components/src/Core.Components.BruTile.Forms/Core.Components.BruTile.Forms.csproj
===================================================================
diff -u -rd993e5ebe5851ea9c65753d8709d73a926a24afd -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.BruTile.Forms/Core.Components.BruTile.Forms.csproj	(.../Core.Components.BruTile.Forms.csproj)	(revision d993e5ebe5851ea9c65753d8709d73a926a24afd)
+++ Core/Components/src/Core.Components.BruTile.Forms/Core.Components.BruTile.Forms.csproj	(.../Core.Components.BruTile.Forms.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -31,7 +31,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
Index: Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj
===================================================================
diff -u -rd993e5ebe5851ea9c65753d8709d73a926a24afd -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj	(.../Core.Components.BruTile.IO.csproj)	(revision d993e5ebe5851ea9c65753d8709d73a926a24afd)
+++ Core/Components/src/Core.Components.BruTile.IO/Core.Components.BruTile.IO.csproj	(.../Core.Components.BruTile.IO.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -27,7 +27,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
Index: Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -157,8 +157,7 @@
             IPersistentCache<byte[]> tileCache = CreateTileCache();
             try
             {
-                ITileProvider provider = BruTileReflectionHelper.GetProviderFromTileSource(newTileSource);
-                TileFetcher = new AsyncTileFetcher(provider,
+                TileFetcher = new AsyncTileFetcher(tileSource,
                                                    BruTileSettings.MemoryCacheMinimum,
                                                    BruTileSettings.MemoryCacheMaximum,
                                                    tileCache);
Index: Core/Components/src/Core.Components.BruTile/Configurations/TileSourceFactory.cs
===================================================================
diff -u -rcc4481f659f52c6c7f7e1bbb82eab11f16d45356 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.BruTile/Configurations/TileSourceFactory.cs	(.../TileSourceFactory.cs)	(revision cc4481f659f52c6c7f7e1bbb82eab11f16d45356)
+++ Core/Components/src/Core.Components.BruTile/Configurations/TileSourceFactory.cs	(.../TileSourceFactory.cs)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -78,7 +78,7 @@
 
         public ITileSource GetKnownTileSource(KnownTileSource knownTileSource)
         {
-            return KnownTileSources.Create(knownTileSource);
+            return KnownTileSources.Create(knownTileSource, userAgent:"Riskeer");
         }
 
         /// <summary>
Index: Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj
===================================================================
diff -u -rd993e5ebe5851ea9c65753d8709d73a926a24afd -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision d993e5ebe5851ea9c65753d8709d73a926a24afd)
+++ Core/Components/src/Core.Components.BruTile/Core.Components.BruTile.csproj	(.../Core.Components.BruTile.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -31,12 +31,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="BruTile.Desktop">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
Index: Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj
===================================================================
diff -u -r5a2dcecc500c6506b666668ce1681fbdc9f25a7a -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 5a2dcecc500c6506b666668ce1681fbdc9f25a7a)
+++ Core/Components/src/Core.Components.DotSpatial/Core.Components.DotSpatial.csproj	(.../Core.Components.DotSpatial.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -36,7 +36,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
       <GeneratePathProperty>true</GeneratePathProperty>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -106,7 +106,7 @@
 
         private float transparency;
 
-        private string level;
+        private int level;
 
         /// <summary>
         /// Creates an instance of this class using some tile source configuration.
Index: Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj	(.../Core.Components.BruTile.Forms.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Components/test/Core.Components.BruTile.Forms.Test/Core.Components.BruTile.Forms.Test.csproj	(.../Core.Components.BruTile.Forms.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.BruTile.IO.Test/Core.Components.BruTile.IO.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.BruTile.IO.Test/Core.Components.BruTile.IO.Test.csproj	(.../Core.Components.BruTile.IO.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Components/test/Core.Components.BruTile.IO.Test/Core.Components.BruTile.IO.Test.csproj	(.../Core.Components.BruTile.IO.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.BruTile.Test/Core.Components.BruTile.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.BruTile.Test/Core.Components.BruTile.Test.csproj	(.../Core.Components.BruTile.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Components/test/Core.Components.BruTile.Test/Core.Components.BruTile.Test.csproj	(.../Core.Components.BruTile.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -22,7 +22,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile.Desktop">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/Core.Components.BruTile.TestUtil.csproj	(.../Core.Components.BruTile.TestUtil.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -33,7 +33,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.TestUtil/TileSchemaFactory.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.BruTile.TestUtil/TileSchemaFactory.cs	(.../TileSchemaFactory.cs)	(revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/TileSchemaFactory.cs	(.../TileSchemaFactory.cs)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -51,7 +51,7 @@
             schema.Title = mapData.Name;
             schema.Format = mapData.PreferredFormat;
 
-            schema.Resolutions["1"] = new Resolution("1", 1);
+            schema.Resolutions[1] = new Resolution(1, 1);
 
             var capabilityIdRegex = new Regex(@"(?<Layer>.+)\((?<TileMatrixSet>.+)\)");
             Match match = capabilityIdRegex.Match(mapData.SelectedCapabilityIdentifier);
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/Core.Components.DotSpatial.Forms.Test.csproj	(.../Core.Components.DotSpatial.Forms.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -29,7 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="DotSpatial.Controls" Version="2.0.0-rc1" />
     <PackageReference Include="DotSpatial.Data" Version="2.0.0-rc1" />
Index: Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Core.Components.DotSpatial.Test.csproj	(.../Core.Components.DotSpatial.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -67,7 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="DotSpatial.Controls" Version="2.0.0-rc1" />
     <PackageReference Include="DotSpatial.Data" Version="2.0.0-rc1" />
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs	(.../BruTileLayerTest.cs)	(revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs	(.../BruTileLayerTest.cs)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -848,7 +848,7 @@
                                                 new TileReceivedEventArgs(new TileInfo
                                                 {
                                                     Extent = new Extent(tileExtent.MinX, tileExtent.MinY, tileExtent.MaxX, tileExtent.MaxY),
-                                                    Index = new TileIndex(0, 0, $"EPSG:28992:{zoomLevel}")
+                                                    Index = new TileIndex(0, 0, zoomLevel)
                                                 }, new byte[0]));
             }
 
@@ -902,7 +902,7 @@
                                                 new TileReceivedEventArgs(new TileInfo
                                                 {
                                                     Extent = new Extent(mapExtent.MinX, mapExtent.MinY, mapExtent.MaxX, mapExtent.MaxY),
-                                                    Index = new TileIndex(0, 0, $"EPSG:28992:{otherZoomLevel}")
+                                                    Index = new TileIndex(0, 0, otherZoomLevel)
                                                 }, new byte[0]));
             }
 
@@ -936,10 +936,10 @@
             mocks.VerifyAll(); // mapFrame.Invalidate should be called
         }
 
-        private static Resolution CreateResolutionForLevel(int level, string epsgCode)
+        private static Resolution CreateResolutionForLevel(int level)
         {
             int numberOfImagesAtLevel = GetNumberOfImages(level);
-            return new Resolution($"{epsgCode}:{level}", GetUnitsPerPixel(level),
+            return new Resolution(level, GetUnitsPerPixel(level),
                                   256, 256,
                                   -285401.92, 903402,
                                   numberOfImagesAtLevel, numberOfImagesAtLevel,
@@ -961,7 +961,7 @@
             return 12288000 / GetNumberOfImages(level);
         }
 
-        private static IDictionary<string, Resolution> CreateResolutionDictionary(string epsgCode, int level)
+        private static IDictionary<int, Resolution> CreateResolutionDictionary(int level)
         {
             int[] levelToCreateResolutionsFor =
             {
@@ -970,8 +970,8 @@
                 level + 1
             };
 
-            return levelToCreateResolutionsFor.ToDictionary(resolutionLevel => $"{epsgCode}:{resolutionLevel}",
-                                                            resolutionLevel => CreateResolutionForLevel(resolutionLevel, epsgCode));
+            return levelToCreateResolutionsFor.ToDictionary(resolutionLevel => resolutionLevel,
+                                                            resolutionLevel => CreateResolutionForLevel(resolutionLevel));
         }
 
         public class TileInfosTestConfig
@@ -1011,13 +1011,12 @@
         {
             const string epsgCode = "EPSG:28992";
             int level = config.Level;
-            string levelId = $"{epsgCode}:{level}";
-
+            
             Dictionary<TileInfo, Bitmap> tileInfoImageLookup = config.TileInfoConfigurations.ToDictionary(
                 c => new TileInfo
                 {
                     Extent = c.Extent,
-                    Index = new TileIndex(c.ColumnIndex, c.RowIndex, levelId)
+                    Index = new TileIndex(c.ColumnIndex, c.RowIndex, level)
                 },
                 c => c.Image);
 
@@ -1032,9 +1031,9 @@
             var tileSchema = mocks.Stub<ITileSchema>();
             tileSchema.Stub(s => s.Srs).Return(epsgCode);
             tileSchema.Stub(s => s.Extent).Return(new Extent(-285401.92, 22598.16, 595401.92, 903402));
-            tileSchema.Stub(s => s.Resolutions).Return(CreateResolutionDictionary(epsgCode, level));
+            tileSchema.Stub(s => s.Resolutions).Return(CreateResolutionDictionary(level));
             tileSchema.Stub(s => s.GetTileInfos(Arg<Extent>.Is.NotNull,
-                                                Arg<string>.Is.Equal(levelId)))
+                                                Arg<int>.Is.Equal(level)))
                       .Return(tileInfoImageLookup.Keys);
 
             var configuration = mocks.Stub<IConfiguration>();
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Core.Components.Gis.Forms.Test.csproj	(.../Core.Components.Gis.Forms.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -28,7 +28,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.8.1</Version>
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj
===================================================================
diff -u -rcd8dc2e7bf21d4b6e299b3e94c0018b4a0efa1b4 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj	(.../Riskeer.Integration.Forms.Test.csproj)	(revision cd8dc2e7bf21d4b6e299b3e94c0018b4a0efa1b4)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Riskeer.Integration.Forms.Test.csproj	(.../Riskeer.Integration.Forms.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -72,7 +72,7 @@
       <Version>3.6.1</Version>
     </PackageReference>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="log4net">
       <Version>2.0.12</Version>
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj
===================================================================
diff -u -ra3ecf99ea72cb40630c422be2f420507318d27c8 -r9d44c3e28f65cdcad943813397f7929b854700fb
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision a3ecf99ea72cb40630c422be2f420507318d27c8)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Riskeer.Integration.Plugin.Test.csproj	(.../Riskeer.Integration.Plugin.Test.csproj)	(revision 9d44c3e28f65cdcad943813397f7929b854700fb)
@@ -104,7 +104,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BruTile">
-      <Version>2.1.2</Version>
+      <Version>3.1.3</Version>
     </PackageReference>
     <PackageReference Include="log4net">
       <Version>2.0.12</Version>