diff --git a/NzbDrone.Core.Test/HistoryProviderTest.cs b/NzbDrone.Core.Test/HistoryProviderTest.cs
index 256e926ad..18c6df726 100644
--- a/NzbDrone.Core.Test/HistoryProviderTest.cs
+++ b/NzbDrone.Core.Test/HistoryProviderTest.cs
@@ -79,7 +79,8 @@ namespace NzbDrone.Core.Test
 
 
             var repo = MockLib.GetEmptyRepository();
-            var history = Builder<History>.CreateNew().Build();
+            var history = Builder<History>.CreateNew()
+                .With(h => h.Quality = QualityTypes.Bluray720p).Build();
             repo.Add(history);
             mocker.SetConstant(repo);
 
@@ -88,6 +89,7 @@ namespace NzbDrone.Core.Test
 
             //Assert
             Assert.IsNotNull(result);
+            result.QualityType.Should().Be(QualityTypes.Bluray720p);
         }
 
         [Test]
diff --git a/NzbDrone.Core/Datastore/Connection.cs b/NzbDrone.Core/Datastore/Connection.cs
index b717abd0f..9e2c836e5 100644
--- a/NzbDrone.Core/Datastore/Connection.cs
+++ b/NzbDrone.Core/Datastore/Connection.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Datastore
 
         public static string GetConnectionString(string path)
         {
-            return String.Format("Data Source={0};Version=3;", path);
+            return String.Format("Data Source={0};Version=3;Cache Size=30000;", path);
         }
 
         public static String MainConnectionString
diff --git a/NzbDrone.Core/Datastore/SqliteProvider.cs b/NzbDrone.Core/Datastore/SqliteProvider.cs
new file mode 100644
index 000000000..b4b2e278c
--- /dev/null
+++ b/NzbDrone.Core/Datastore/SqliteProvider.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Migrator.Framework;
+using Migrator.Providers.SQLite;
+
+namespace NzbDrone.Core.Datastore
+{
+    class SqliteProvider
+    {
+        private readonly ITransformationProvider _dataBase;
+
+        public SqliteProvider(string connectionString)
+        {
+            _dataBase = new SQLiteTransformationProvider(new SQLiteDialect(), connectionString);
+        }
+
+
+        public int GetPageSize()
+        {
+            return Convert.ToInt32(_dataBase.ExecuteScalar("PRAGMA cache_size"));
+        }
+
+
+
+    }
+}
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index fb3009a98..69eff6d93 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -164,6 +164,7 @@
     <Compile Include="Datastore\MigrationLogger.cs" />
     <Compile Include="Datastore\Migrations.cs" />
     <Compile Include="Datastore\RepositoryProvider.cs" />
+    <Compile Include="Datastore\SqliteProvider.cs" />
     <Compile Include="Helpers\EpisodeRenameHelper.cs" />
     <Compile Include="Helpers\EpisodeSortingHelper.cs" />
     <Compile Include="Helpers\SceneNameHelper.cs" />
diff --git a/NzbDrone.Core/Providers/HistoryProvider.cs b/NzbDrone.Core/Providers/HistoryProvider.cs
index 189de8d84..1074f1740 100644
--- a/NzbDrone.Core/Providers/HistoryProvider.cs
+++ b/NzbDrone.Core/Providers/HistoryProvider.cs
@@ -49,8 +49,8 @@ namespace NzbDrone.Core.Providers
 
         public virtual Quality GetBestQualityInHistory(long episodeId)
         {
-            var history = AllItems().Where(c => c.EpisodeId == episodeId).Select(d => new Quality() { QualityType = d.Quality, Proper = d.IsProper }).ToList();
-            history.Sort();
+            var history = AllItems().Where(c => c.EpisodeId == episodeId).ToList().Select(d => new Quality(d.Quality, d.IsProper)).OrderBy(c => c);
+
             return history.FirstOrDefault();
         }