diff --git a/NzbDrone.Api/Frontend/IAddCacheHeaders.cs b/NzbDrone.Api/Frontend/IAddCacheHeaders.cs
new file mode 100644
index 000000000..e3bb01864
--- /dev/null
+++ b/NzbDrone.Api/Frontend/IAddCacheHeaders.cs
@@ -0,0 +1,31 @@
+using Nancy;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Common.EnvironmentInfo;
+
+namespace NzbDrone.Api.Frontend
+{
+    public interface IAddCacheHeaders
+    {
+        void ToResponse(Request request, Response response);
+    }
+
+    public class AddCacheHeaders : IAddCacheHeaders
+    {
+        public void ToResponse(Request request, Response response)
+        {
+            if (!RuntimeInfo.IsProduction)
+            {
+                response.Headers.DisableCache();
+                return;
+            }
+
+            if (request.Url.Path.ToLower() == "app.js")
+            {
+                response.Headers.DisableCache();
+                return;
+            }
+
+            response.Headers.EnableCache();
+        }
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Api/Frontend/StaticResourceProvider.cs b/NzbDrone.Api/Frontend/StaticResourceProvider.cs
index b2e81fb1a..79ed9c811 100644
--- a/NzbDrone.Api/Frontend/StaticResourceProvider.cs
+++ b/NzbDrone.Api/Frontend/StaticResourceProvider.cs
@@ -19,14 +19,17 @@ namespace NzbDrone.Api.Frontend
     {
         private readonly IDiskProvider _diskProvider;
         private readonly IEnumerable<IMapHttpRequestsToDisk> _requestMappers;
+        private readonly IAddCacheHeaders _addCacheHeaders;
         private readonly Logger _logger;
 
         public StaticResourceProvider(IDiskProvider diskProvider,
                                       IEnumerable<IMapHttpRequestsToDisk> requestMappers,
+                                      IAddCacheHeaders addCacheHeaders,
                                       Logger logger)
         {
             _diskProvider = diskProvider;
             _requestMappers = requestMappers;
+            _addCacheHeaders = addCacheHeaders;
             _logger = logger;
         }
 
@@ -48,18 +51,8 @@ namespace NzbDrone.Api.Frontend
                 if (_diskProvider.FileExists(filePath))
                 {
                     var response = new StreamResponse(() => File.OpenRead(filePath), MimeTypes.GetMimeType(filePath));
+                    _addCacheHeaders.ToResponse(context.Request, response);
 
-                    if (RuntimeInfo.IsProduction)
-                    {
-                        response.Headers.EnableCache();
-                    }
-
-                    else
-                    {
-                        response.Headers.DisableCache();
-                    }
-
-                    //return response.CompressResponse(context.Request);
                     return response;
                 }
 
diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index 896dcebfa..aaa3a3c8a 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -106,6 +106,7 @@
     <Compile Include="Episodes\EpisodeResource.cs" />
     <Compile Include="Extensions\GZipPipeline.cs" />
     <Compile Include="Extensions\NancyJsonSerializer.cs" />
+    <Compile Include="Frontend\IAddCacheHeaders.cs" />
     <Compile Include="Frontend\MediaCoverMapper.cs" />
     <Compile Include="Frontend\IMapHttpRequestsToDisk.cs" />
     <Compile Include="Frontend\IndexModule.cs" />