diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs
index f8ef7b003..82b53fdaf 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs
@@ -3,7 +3,6 @@ using Orchard.OutputCache.Models;
 using Orchard.OutputCache.Services;
 using Orchard.ContentManagement;
 using Orchard.Core.Common.Models;
-using Orchard.Data;
 using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.OutputCache.Handlers {
@@ -11,11 +10,9 @@ namespace Orchard.OutputCache.Handlers {
         private readonly ICacheService _cacheService;
 
         public CacheSettingsPartHandler(
-            IRepository<CacheSettingsPartRecord> repository,
             ICacheService cacheService) {
             _cacheService = cacheService;
             Filters.Add(new ActivatingFilter<CacheSettingsPart>("Site"));
-            Filters.Add(StorageFilter.For(repository));
 
             // initializing default cache settings values
             OnInitializing<CacheSettingsPart>((context, part) => { part.DefaultCacheDuration = 300; });
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Migrations.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Migrations.cs
index cc9d30a8e..d0e99d9d5 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Migrations.cs
@@ -3,19 +3,7 @@
 namespace Orchard.OutputCache {
     public class Migrations : DataMigrationImpl {
         public int Create() {
-
-            SchemaBuilder.CreateTable("CacheSettingsPartRecord",
-                table => table
-                    .ContentPartRecord()
-                    .Column<int>("DefaultCacheDuration")
-                    .Column<int>("DefaultMaxAge")
-                    .Column<string>("IgnoredUrls", c => c.Unlimited())
-                    .Column<string>("VaryQueryStringParameters", c => c.Unlimited())
-                    .Column<string>("VaryRequestHeaders", c => c.Unlimited())
-                    .Column<bool>("DebugMode", c => c.WithDefault(false))
-                    .Column<bool>("ApplyCulture", c => c.WithDefault(false))
-                );
-
+            
             SchemaBuilder.CreateTable("CacheParameterRecord",
                     table => table
                         .Column<int>("Id", c => c.PrimaryKey().Identity())
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheSettingsPart.cs
index d10f3639d..a30db7854 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheSettingsPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheSettingsPart.cs
@@ -1,42 +1,42 @@
 using Orchard.ContentManagement;
 
 namespace Orchard.OutputCache.Models {
-    public class CacheSettingsPart : ContentPart<CacheSettingsPartRecord> {
+    public class CacheSettingsPart : ContentPart {
         public const string CacheKey = "CacheSettingsPart";
 
         public int DefaultCacheDuration {
-            get { return Record.DefaultCacheDuration; }
-            set { Record.DefaultCacheDuration = value; }
+            get { return this.Retrieve(x => x.DefaultCacheDuration); }
+            set { this.Store(x => x.DefaultCacheDuration, value); }
         }
 
         public int DefaultMaxAge {
-            get { return Record.DefaultMaxAge; }
-            set { Record.DefaultMaxAge = value; }
+            get { return this.Retrieve(x => x.DefaultMaxAge); }
+            set { this.Store(x => x.DefaultMaxAge, value); }
         }
 
         public string VaryQueryStringParameters {
-            get { return Record.VaryQueryStringParameters; }
-            set { Record.VaryQueryStringParameters = value; }
+            get { return this.Retrieve(x => x.VaryQueryStringParameters); }
+            set { this.Store(x => x.VaryQueryStringParameters, value); }
         }
 
         public string VaryRequestHeaders {
-            get { return Record.VaryRequestHeaders; }
-            set { Record.VaryRequestHeaders = value; }
+            get { return this.Retrieve(x => x.VaryRequestHeaders); }
+            set { this.Store(x => x.VaryRequestHeaders, value); }
         }
 
         public string IgnoredUrls {
-            get { return Record.IgnoredUrls; }
-            set { Record.IgnoredUrls = value; }
+            get { return this.Retrieve(x => x.IgnoredUrls); }
+            set { this.Store(x => x.IgnoredUrls, value); }
         }
 
         public bool ApplyCulture {
-            get { return Record.ApplyCulture; }
-            set { Record.ApplyCulture = value; }
+            get { return this.Retrieve(x => x.ApplyCulture); }
+            set { this.Store(x => x.ApplyCulture, value); }
         }
 
         public bool DebugMode {
-            get { return Record.DebugMode; }
-            set { Record.DebugMode = value; }
+            get { return this.Retrieve(x => x.DebugMode); }
+            set { this.Store(x => x.DebugMode, value); }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheSettingsPartRecord.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheSettingsPartRecord.cs
deleted file mode 100644
index efac6d778..000000000
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheSettingsPartRecord.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Orchard.ContentManagement.Records;
-using Orchard.Data.Conventions;
-
-namespace Orchard.OutputCache.Models {
-    public class CacheSettingsPartRecord : ContentPartRecord {
-        public virtual int DefaultCacheDuration { get; set; }
-        public virtual int DefaultMaxAge { get; set; }
-        public virtual bool DebugMode { get; set; }
-        public virtual bool ApplyCulture { get; set; }
-
-        [StringLengthMax]
-        public virtual string VaryQueryStringParameters { get; set; }
-        
-        [StringLengthMax]
-        public virtual string VaryRequestHeaders { get; set; }
-        
-        [StringLengthMax]
-        public virtual string IgnoredUrls { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
index 1d4b703cf..d5c3b29c4 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
@@ -102,7 +102,6 @@
     <Compile Include="Migrations.cs" />
     <Compile Include="Models\CacheItem.cs" />
     <Compile Include="Models\CacheSettingsPart.cs" />
-    <Compile Include="Models\CacheSettingsPartRecord.cs" />
     <Compile Include="Models\CacheParameterRecord.cs" />
     <Compile Include="Services\CacheService.cs" />
     <Compile Include="Services\DefaultCacheControlStrategy.cs" />
diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
index 09100ac4a..8ce9fafaf 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
@@ -106,6 +106,20 @@ namespace Upgrade.Controllers {
 
             _upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_AntiSpam_TypePadSettingsPartRecord"), null);
 
+            // CacheSettingsPartRecord
+            _upgradeService.ExecuteReader("SELECT * FROM " + _upgradeService.GetPrefixedTableName("Orchard_OutputCache_CacheSettingsPartRecord"),
+                (reader, connection) => {
+                    site.As<InfosetPart>().Store("CacheSettingsPart", "DefaultCacheDuration", (int)reader["DefaultCacheDuration"]);
+                    site.As<InfosetPart>().Store("CacheSettingsPart", "DefaultMaxAge", (int)reader["DefaultMaxAge"]);
+                    site.As<InfosetPart>().Store("CacheSettingsPart", "VaryQueryStringParameters", (string)reader["VaryQueryStringParameters"]);
+                    site.As<InfosetPart>().Store("CacheSettingsPart", "VaryRequestHeaders", (string)reader["VaryRequestHeaders"]);
+                    site.As<InfosetPart>().Store("CacheSettingsPart", "IgnoredUrls", (string)reader["IgnoredUrls"]);
+                    site.As<InfosetPart>().Store("CacheSettingsPart", "ApplyCulture", (bool)reader["ApplyCulture"]);
+                    site.As<InfosetPart>().Store("CacheSettingsPart", "DebugMode", (bool)reader["DebugMode"]);
+                });
+
+            _upgradeService.ExecuteReader("DROP TABLE " + _upgradeService.GetPrefixedTableName("Orchard_OutputCache_CacheSettingsPartRecord"), null);
+
 
             _orchardServices.Notifier.Information(T("Site Settings migrated successfully"));