diff --git a/MapControl/Shared/TileImageLoader.cs b/MapControl/Shared/TileImageLoader.cs
index c2cda1e7..cbdd9acf 100644
--- a/MapControl/Shared/TileImageLoader.cs
+++ b/MapControl/Shared/TileImageLoader.cs
@@ -163,7 +163,7 @@ namespace MapControl
             {
                 await tile.LoadImageAsync(() => tileSource.LoadImageAsync(tile.ZoomLevel, tile.Column, tile.Row)).ConfigureAwait(false);
             }
-            else if (uri.Scheme != "http" && uri.Scheme != "https" || string.IsNullOrEmpty(cacheName))
+            else if (uri.Scheme != Uri.UriSchemeHttps && uri.Scheme != Uri.UriSchemeHttp || string.IsNullOrEmpty(cacheName))
             {
                 await tile.LoadImageAsync(() => tileSource.LoadImageAsync(uri)).ConfigureAwait(false);
             }
diff --git a/MapControl/Shared/TileSource.cs b/MapControl/Shared/TileSource.cs
index 7f0976f9..296d49f0 100644
--- a/MapControl/Shared/TileSource.cs
+++ b/MapControl/Shared/TileSource.cs
@@ -33,7 +33,7 @@ namespace MapControl
         }
 
         /// <summary>
-        /// Loads a tile image without an Uri.
+        /// Loads a tile image without an Uri. Called when GetUri returns null.
         /// </summary>
         public virtual Task<ImageSource> LoadImageAsync(int zoomLevel, int column, int row)
         {
@@ -41,7 +41,8 @@ namespace MapControl
         }
 
         /// <summary>
-        /// Loads a tile image from an Uri.
+        /// Loads a tile image from an Uri. Called when the Uri scheme is neither
+        /// http nor https or when the TileImageLoader is not using an image cache.
         /// </summary>
         public virtual Task<ImageSource> LoadImageAsync(Uri uri)
         {
@@ -49,7 +50,8 @@ namespace MapControl
         }
 
         /// <summary>
-        /// Loads a tile image from an encoded frame buffer.
+        /// Loads a tile image from an encoded image buffer. Called when the
+        /// TileImageLoader caches image buffers from http or https requests.
         /// </summary>
         public virtual Task<ImageSource> LoadImageAsync(byte[] buffer)
         {
diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml b/SampleApps/AvaloniaApp/MainWindow.axaml
index 53c02b3d..850a885b 100644
--- a/SampleApps/AvaloniaApp/MainWindow.axaml
+++ b/SampleApps/AvaloniaApp/MainWindow.axaml
@@ -131,7 +131,7 @@
                 </tools:MapLayerMenuItem>
                 <tools:MapLayerMenuItem Text="OpenStreetMap French">
                     <map:MapTileLayer
-                        TileSource="http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
+                        TileSource="https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
                         SourceName="OpenStreetMap French"
                         Description="© [OpenStreetMap France](https://www.openstreetmap.fr/mentions-legales/) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
                 </tools:MapLayerMenuItem>
diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml
index 7289a7fe..7aae2766 100644
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@@ -187,7 +187,7 @@
                 </tools:MapLayerMenuItem>
                 <tools:MapLayerMenuItem Text="OpenStreetMap French">
                     <map:MapTileLayer
-                        TileSource="http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
+                        TileSource="https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
                         SourceName="OpenStreetMap French"
                         Description="© [OpenStreetMap France](https://www.openstreetmap.fr/mentions-legales/) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
                 </tools:MapLayerMenuItem>
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index edde42b5..5e0eb331 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -212,7 +212,7 @@
                 </tools:MapLayerMenuItem>
                 <tools:MapLayerMenuItem Text="OpenStreetMap French">
                     <map:MapTileLayer
-                        TileSource="http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
+                        TileSource="https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
                         SourceName="OpenStreetMap French"
                         Description="© [OpenStreetMap France](https://www.openstreetmap.fr/mentions-legales/) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
                 </tools:MapLayerMenuItem>
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index 8fa410be..77617a56 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -189,7 +189,7 @@
                 </tools:MapLayerMenuItem>
                 <tools:MapLayerMenuItem Text="OpenStreetMap French">
                     <map:MapTileLayer
-                        TileSource="http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
+                        TileSource="https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png"
                         SourceName="OpenStreetMap French"
                         Description="© [OpenStreetMap France](https://www.openstreetmap.fr/mentions-legales/) © [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"/>
                 </tools:MapLayerMenuItem>