Index: Core/Components/src/Core.Components.BruTile/Configurations/IConfiguration.cs
===================================================================
diff -u -r396d39591f11aad05a6cd0e66ead43fefd9713c3 -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/src/Core.Components.BruTile/Configurations/IConfiguration.cs	(.../IConfiguration.cs)	(revision 396d39591f11aad05a6cd0e66ead43fefd9713c3)
+++ Core/Components/src/Core.Components.BruTile/Configurations/IConfiguration.cs	(.../IConfiguration.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -36,9 +36,9 @@
     public interface IConfiguration : IDisposable
     {
         /// <summary>
-        /// Gets the <see cref="ITileSource"/>.
+        /// Gets the <see cref="ITileSchema"/>.
         /// </summary>
-        ITileSource TileSource { get; }
+        ITileSchema TileSchema { get; }
 
         /// <summary>
         /// Gets the <see cref="ITileFetcher"/>.
Index: Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs
===================================================================
diff -u -r797872a6e0525f12c0f84b03e996a9d42630ad0b -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 797872a6e0525f12c0f84b03e996a9d42630ad0b)
+++ Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -43,6 +43,7 @@
         protected readonly string PersistentCacheDirectoryPath;
 
         private FileCache fileCache;
+        private ITileSource tileSource;
 
         /// <summary>
         /// Initializes a new instance of <see cref="PersistentCacheConfiguration"/>.
@@ -62,7 +63,13 @@
             PersistentCacheDirectoryPath = persistentCacheDirectoryPath;
         }
 
-        public ITileSource TileSource { get; private set; }
+        public ITileSchema TileSchema
+        {
+            get
+            {
+                return tileSource?.Schema;
+            }
+        }
 
         public ITileFetcher TileFetcher { get; private set; }
 
@@ -113,7 +120,7 @@
         {
             ThrowExceptionIfDisposed();
 
-            TileSource = tileSource;
+            this.tileSource = tileSource;
             IPersistentCache<byte[]> tileCache = CreateTileCache();
             try
             {
Index: Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs
===================================================================
diff -u -rc7dcfeb120035a08adfe115275512e1e6c5b4931 -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision c7dcfeb120035a08adfe115275512e1e6c5b4931)
+++ Core/Components/src/Core.Components.DotSpatial/Layer/BruTile/BruTileLayer.cs	(.../BruTileLayer.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -139,7 +139,7 @@
             }
             this.configuration = configuration;
 
-            ITileSchema tileSchema = configuration.TileSource.Schema;
+            ITileSchema tileSchema = configuration.TileSchema;
             sourceProjection = GetTileSourceProjectionInfo(tileSchema.Srs);
 
             Projection = sourceProjection;
@@ -243,7 +243,7 @@
                                                                   args.GeographicExtents
                                                               };
 
-            ITileSchema schema = configuration.TileSource.Schema;
+            ITileSchema schema = configuration.TileSchema;
             foreach (DotSpatialExtent region in regionsToDraw)
             {
                 DrawRegion(args, region, schema);
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs
===================================================================
diff -u -ra5c5133ec23681679e77ff31b89e6410d366f247 -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs	(.../PersistentCacheConfigurationTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs	(.../PersistentCacheConfigurationTest.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -61,7 +61,7 @@
                 Assert.IsInstanceOf<IConfiguration>(configuration);
 
                 Assert.IsFalse(configuration.Initialized);
-                Assert.IsNull(configuration.TileSource);
+                Assert.IsNull(configuration.TileSchema);
                 Assert.IsNull(configuration.TileFetcher);
             }
         }
@@ -148,7 +148,7 @@
                         configuration.TestInitializeFromTileSource(tileSource);
 
                         // Assert
-                        Assert.AreSame(tileSource, configuration.TileSource);
+                        Assert.AreSame(tileSource.Schema, configuration.TileSchema);
                         Assert.IsInstanceOf<AsyncTileFetcher>(configuration.TileFetcher);
                         Assert.IsTrue(configuration.Initialized);
                     }
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs
===================================================================
diff -u -r0f778d2d9cc904175274baf4d6a21996ccef8d54 -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs	(.../WellKnownTileSourceLayerConfigurationTest.cs)	(revision 0f778d2d9cc904175274baf4d6a21996ccef8d54)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/WellKnownTileSourceLayerConfigurationTest.cs	(.../WellKnownTileSourceLayerConfigurationTest.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using BruTile;
 using Core.Common.Gui.TestUtil.Settings;
 using Core.Common.TestUtil;
 using Core.Components.BruTile.Configurations;
@@ -66,7 +65,7 @@
                             // Then
                             Assert.IsTrue(configuration.Initialized);
 
-                            Assert.IsNotNull(configuration.TileSource);
+                            Assert.IsNotNull(configuration.TileSchema);
                             Assert.IsInstanceOf<AsyncTileFetcher>(configuration.TileFetcher);
                         }
                     }
@@ -89,10 +88,9 @@
                     // Assert
                     Assert.IsTrue(clone.Initialized);
 
-                    Assert.AreEqual(configuration.TileSource, clone.TileSource);
-                    Assert.AreEqual(configuration.TileSource.Name, clone.TileSource.Name);
-                    AssertAttribution(configuration.TileSource.Attribution, clone.TileSource.Attribution);
-                    Assert.AreEqual(configuration.TileSource.Schema.Format, clone.TileSource.Schema.Format);
+                    Assert.AreEqual(configuration.TileSchema, clone.TileSchema);
+                    Assert.AreEqual(configuration.TileSchema.Name, clone.TileSchema.Name);
+                    Assert.AreEqual(configuration.TileSchema.Format, clone.TileSchema.Format);
 
                     Assert.IsInstanceOf<AsyncTileFetcher>(clone.TileFetcher);
                 }
@@ -173,18 +171,5 @@
         {
             directoryDisposeHelper.Dispose();
         }
-
-        private static void AssertAttribution(Attribution expectedAttribution, Attribution actualAttribution)
-        {
-            if (expectedAttribution == null)
-            {
-                Assert.IsNull(actualAttribution);
-            }
-            else
-            {
-                Assert.AreEqual(expectedAttribution.Text, actualAttribution.Text);
-                Assert.AreEqual(expectedAttribution.Url, actualAttribution.Url);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/WmtsLayerConfigurationTest.cs
===================================================================
diff -u -r3204fdab2e01e8fcb73ca38d74adfde8fa8d369a -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/WmtsLayerConfigurationTest.cs	(.../WmtsLayerConfigurationTest.cs)	(revision 3204fdab2e01e8fcb73ca38d74adfde8fa8d369a)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/WmtsLayerConfigurationTest.cs	(.../WmtsLayerConfigurationTest.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -144,7 +144,7 @@
                     // Assert
                     Assert.IsTrue(configuration.Initialized);
                     Assert.IsTrue(configuration.TileFetcher.IsReady());
-                    Assert.AreSame(tileSource2, configuration.TileSource);
+                    Assert.AreSame(tileSource2.Schema, configuration.TileSchema);
                 }
             }
             mocks.VerifyAll();
@@ -184,7 +184,7 @@
 
                 Assert.IsFalse(clone.Initialized);
                 Assert.IsNull(clone.TileFetcher, "TileFetcher should be null because the clone hasn't been initialized yet.");
-                Assert.IsNull(clone.TileSource, "TileSource should be null because the clone hasn't been initialized yet.");
+                Assert.IsNull(clone.TileSchema, "TileSchema should be null because the clone hasn't been initialized yet.");
             }
             mocks.VerifyAll();
         }
@@ -258,7 +258,7 @@
                 // Assert
                 Assert.IsTrue(clone.Initialized);
                 Assert.IsTrue(clone.TileFetcher.IsReady());
-                Assert.AreSame(configuration.TileSource, clone.TileSource);
+                Assert.AreSame(configuration.TileSchema, clone.TileSchema);
             }
             mocks.VerifyAll();
         }
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/WellKnownBackgroundLayerStatusTest.cs
===================================================================
diff -u -r797872a6e0525f12c0f84b03e996a9d42630ad0b -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/WellKnownBackgroundLayerStatusTest.cs	(.../WellKnownBackgroundLayerStatusTest.cs)	(revision 797872a6e0525f12c0f84b03e996a9d42630ad0b)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/WellKnownBackgroundLayerStatusTest.cs	(.../WellKnownBackgroundLayerStatusTest.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -279,12 +279,9 @@
             schema.Stub(s => s.Srs).Return("EPSG:28992");
             schema.Stub(s => s.Extent).Return(new Extent());
 
-            var tileSource = mocks.Stub<ITileSource>();
-            tileSource.Stub(ts => ts.Schema).Return(schema);
-
             var configuration = mocks.Stub<IConfiguration>();
             configuration.Stub(c => c.Initialized).Return(true);
-            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.TileSchema).Return(schema);
             configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
             configuration.Stub(c => c.Dispose());
             return configuration;
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/WmtsBackgroundLayerStatusTest.cs
===================================================================
diff -u -r797872a6e0525f12c0f84b03e996a9d42630ad0b -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/WmtsBackgroundLayerStatusTest.cs	(.../WmtsBackgroundLayerStatusTest.cs)	(revision 797872a6e0525f12c0f84b03e996a9d42630ad0b)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/WmtsBackgroundLayerStatusTest.cs	(.../WmtsBackgroundLayerStatusTest.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -348,12 +348,9 @@
             schema.Stub(s => s.Srs).Return("EPSG:28992");
             schema.Stub(s => s.Extent).Return(new Extent());
 
-            var tileSource = mocks.Stub<ITileSource>();
-            tileSource.Stub(ts => ts.Schema).Return(schema);
-
             var configuration = mocks.Stub<IConfiguration>();
             configuration.Stub(c => c.Initialized).Return(true);
-            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.TileSchema).Return(schema);
             configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
             configuration.Stub(c => c.Dispose());
             return configuration;
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -r4b24b9c98dd06f31acd9e1282b287c491b07ab2f
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs	(.../BruTileLayerTest.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs	(.../BruTileLayerTest.cs)	(revision 4b24b9c98dd06f31acd9e1282b287c491b07ab2f)
@@ -451,19 +451,16 @@
             schema.Stub(s => s.Srs).Return(authorityCode);
             schema.Stub(s => s.Extent).Return(extent);
 
-            var tileSource = mocks.Stub<ITileSource>();
-            tileSource.Stub(ts => ts.Schema).Return(schema);
-
             var clonedConfiguration = mocks.Stub<IConfiguration>();
             clonedConfiguration.Stub(c => c.Initialized).Return(true);
-            clonedConfiguration.Stub(c => c.TileSource).Return(tileSource);
+            clonedConfiguration.Stub(c => c.TileSchema).Return(schema);
             clonedConfiguration.Stub(c => c.TileFetcher).Return(tileFetcher);
             clonedConfiguration.Stub(c => c.Dispose());
 
             IConfiguration configuration = mocks.Stub<IConfiguration>();
             configuration.Expect(c => c.Clone()).Return(clonedConfiguration);
             configuration.Stub(c => c.Initialized).Return(true);
-            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.TileSchema).Return(schema);
             configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
             configuration.Stub(c => c.Dispose());
 
@@ -587,13 +584,10 @@
             schema.Stub(s => s.Srs).Return("EPSG:28992");
             schema.Stub(s => s.Extent).Return(new Extent());
 
-            var tileSource = mocks.Stub<ITileSource>();
-            tileSource.Stub(ts => ts.Schema).Return(schema);
-
             bool disposedLocked = false;
             IConfiguration configuration = mocks.Stub<IConfiguration>();
             configuration.Stub(c => c.Initialized).Return(true);
-            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.TileSchema).Return(schema);
             configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
             configuration.Expect(c => c.Dispose())
                          .WhenCalled(invocation =>
@@ -1022,13 +1016,10 @@
                                                 Arg<string>.Is.Equal(levelId)))
                       .Return(tileInfoImageLookup.Keys);
 
-            var tileSource = mocks.Stub<ITileSource>();
-            tileSource.Stub(ts => ts.Schema).Return(tileSchema);
-
             IConfiguration configuration = mocks.Stub<IConfiguration>();
             configuration.Stub(c => c.Initialized).Return(true);
             configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
-            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.TileSchema).Return(tileSchema);
             configuration.Stub(c => c.Dispose());
             return configuration;
         }
@@ -1096,14 +1087,11 @@
             schema.Stub(s => s.Srs).Return(tileSchemaSrsString);
             schema.Stub(s => s.Extent).Return(tileSourceExtent);
 
-            var tileSource = mocks.Stub<ITileSource>();
-            tileSource.Stub(ts => ts.Schema).Return(schema);
-
             var tileFetcher = mocks.Stub<ITileFetcher>();
 
             IConfiguration configuration = mocks.Stub<IConfiguration>();
             configuration.Stub(c => c.Initialized).Return(true);
-            configuration.Stub(c => c.TileSource).Return(tileSource);
+            configuration.Stub(c => c.TileSchema).Return(schema);
             configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
             configuration.Stub(c => c.Dispose());
             return configuration;
@@ -1115,17 +1103,14 @@
             schema.Stub(s => s.Srs).Return("EPSG:28992");
             schema.Stub(s => s.Extent).Return(new Extent());
 
-            var tileSource = mocks.Stub<ITileSource>();
-            tileSource.Stub(ts => ts.Schema).Return(schema);
-
             var tileFetcher = mocks.Stub<ITileFetcher>();
 
             IConfiguration configuration = mocks.Stub<IConfiguration>();
             using (mocks.Ordered())
             {
                 configuration.Stub(c => c.Initialized).Return(false);
                 configuration.Expect(c => c.Initialize());
-                configuration.Stub(c => c.TileSource).Return(tileSource);
+                configuration.Stub(c => c.TileSchema).Return(schema);
                 configuration.Stub(c => c.TileFetcher).Return(tileFetcher);
                 configuration.Stub(c => c.Dispose());
             }