1 files changed, 9 insertions, 10 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs
index 93d4c8877..378e89067 100644
--- a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller;
 using MediaBrowser.Model.Weather;
 using System;
 using System.ComponentModel.Composition;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 
@@ -15,7 +16,7 @@ namespace MediaBrowser.Api.HttpHandlers
         {
             return ApiService.IsApiUrlMatch("weather", request);
         }
-        
+
         protected override Task<WeatherInfo> GetObjectToSerialize()
         {
             // If a specific zip code was requested on the query string, use that. Otherwise use the value from configuration
@@ -27,18 +28,16 @@ namespace MediaBrowser.Api.HttpHandlers
                 zipCode = Kernel.Instance.Configuration.WeatherZipCode;
             }
 
-            return Kernel.Instance.WeatherClient.GetWeatherInfoAsync(zipCode);
+            return Kernel.Instance.WeatherProviders.First().GetWeatherInfoAsync(zipCode);
         }
 
-        /// <summary>
-        /// Tell the client to cache the weather info for 15 minutes
-        /// </summary>
-        public override TimeSpan CacheDuration
+        protected override async Task<ResponseInfo> GetResponseInfo()
         {
-            get
-            {
-                return TimeSpan.FromMinutes(15);
-            }
+            var info = await base.GetResponseInfo().ConfigureAwait(false);
+
+            info.CacheDuration = TimeSpan.FromMinutes(15);
+
+            return info;
         }
     }
 }