diff --git a/.gitignore b/.gitignore
index 519a1e3db..a4a8b593d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,4 @@ NzbDrone.Web/MediaCover
 UpdateLogs/
 */Bootstrap/*.css
 *//Bootstrap/*.css
+NzbDrone.Web/cassette-cache/*
diff --git a/NzbDrone.Web/Cassette.targets b/NzbDrone.Web/Cassette.targets
new file mode 100644
index 000000000..7f2ab6b26
--- /dev/null
+++ b/NzbDrone.Web/Cassette.targets
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+    The web application csproj file has been modified to import this file.
+    So after a build, the Cassette bundles will be saved into a cache directory.
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">    
+    <UsingTask AssemblyFile="$(OutputPath)\Cassette.MSBuild.dll" TaskName="CreateBundles"/>
+    <Target Name="Bundle" AfterTargets="Build">
+        <CreateBundles />
+        <!--
+        CreateBundles has the following optional properties:
+            Source: The root directory of the web application.
+            Bin:    The directory containing the web application assemblies. Default is "bin".
+            Output: The directory to save the created bundles to. Default is "cassette-cache".
+            IncludeOtherFiles: When true, non-bundled files such as images referenced by stylesheets are also copied to the output directory. Default is false.
+            
+        The Web.config must also have the following section:
+            <cassette cacheDirectory="cassette-cache" />
+        -->
+    </Target>
+</Project>
\ No newline at end of file
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index abaf1c5f5..09a61beb0 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -74,6 +74,9 @@
     <Reference Include="Cassette.Less">
       <HintPath>..\packages\Cassette.Less.2.0.0\lib\net40-client\Cassette.Less.dll</HintPath>
     </Reference>
+    <Reference Include="Cassette.MSBuild">
+      <HintPath>..\packages\Cassette.MSBuild.2.0.0\lib\net40\Cassette.MSBuild.dll</HintPath>
+    </Reference>
     <Reference Include="Cassette.Views">
       <HintPath>..\packages\Cassette.Views.2.0.0\lib\net40\Cassette.Views.dll</HintPath>
     </Reference>
@@ -378,6 +381,7 @@
     <Content Include="_backboneApp\JsLibraries\backbone.js" />
     <Content Include="_backboneApp\JsLibraries\backbone.marionette.js" />
     <Content Include="_backboneApp\AddSeries\addSeriesTemplate.html" />
+    <Content Include="Cassette.targets" />
     <None Include="_backboneApp\JsLibraries\jquery-1.8.2.intellisense.js" />
     <Content Include="_backboneApp\JsLibraries\jquery-1.8.2.js" />
     <Content Include="_backboneApp\JsLibraries\jquery-ui-1.9.0.js" />
@@ -782,4 +786,5 @@
 xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8876.1\NativeBinaries\x86\*.*" "$(TargetDir)x86"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-</Project>
+  <Import Project="Cassette.targets" />
+</Project>
\ No newline at end of file
diff --git a/NzbDrone.Web/Web.config b/NzbDrone.Web/Web.config
index f1af6fc35..d2baa4460 100644
--- a/NzbDrone.Web/Web.config
+++ b/NzbDrone.Web/Web.config
@@ -6,7 +6,7 @@
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0" />
   </startup>
-  <cassette rewriteHtml="true" />
+  <cassette rewriteHtml="true" cacheDirectory="cassette-cache" />
   <appSettings>
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
diff --git a/NzbDrone.Web/packages.config b/NzbDrone.Web/packages.config
index d0c44136e..84015841a 100644
--- a/NzbDrone.Web/packages.config
+++ b/NzbDrone.Web/packages.config
@@ -7,6 +7,7 @@
   <package id="Cassette" version="2.0.0" targetFramework="net40" />
   <package id="Cassette.Aspnet" version="2.0.0" targetFramework="net40" />
   <package id="Cassette.Less" version="2.0.0" targetFramework="net40" />
+  <package id="Cassette.MSBuild" version="2.0.0" targetFramework="net40" />
   <package id="Cassette.Views" version="2.0.0" targetFramework="net40" />
   <package id="DataTables.Mvc" version="0.1.0.85" />
   <package id="DataTables.Mvc.Core" version="0.1.0.85" />