diff --git a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
index 6d805f83d..30f412d1b 100644
--- a/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
+++ b/NzbDrone.Core.Test/Datastore/ObjectDatabaseFixture.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Test.Datastore
         public void SingleOrDefault_should_return_null_on_empty_db()
         {
             Mocker.Resolve<IDatabase>()
-                  .DataMapper.Query<Series>()
+                  .GetDataMapper().Query<Series>()
                   .SingleOrDefault(c => c.CleanTitle == "SomeTitle")
                   .Should()
                   .BeNull();
diff --git a/NzbDrone.Core/Datastore/BasicRepository.cs b/NzbDrone.Core/Datastore/BasicRepository.cs
index bb49496ef..6447e67d5 100644
--- a/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Datastore
 
         private IDataMapper DataMapper
         {
-            get { return _database.DataMapper; }
+            get { return _database.GetDataMapper(); }
         }
 
         public BasicRepository(IDatabase database, IMessageAggregator messageAggregator)
diff --git a/NzbDrone.Core/Datastore/Database.cs b/NzbDrone.Core/Datastore/Database.cs
index 963761bbb..0890699fc 100644
--- a/NzbDrone.Core/Datastore/Database.cs
+++ b/NzbDrone.Core/Datastore/Database.cs
@@ -5,7 +5,7 @@ namespace NzbDrone.Core.Datastore
 {
     public interface IDatabase
     {
-        IDataMapper DataMapper { get; }
+        IDataMapper GetDataMapper();
     }
 
     public class Database : IDatabase
@@ -17,12 +17,9 @@ namespace NzbDrone.Core.Datastore
             _dataMapperFactory = dataMapperFactory;
         }
 
-        public IDataMapper DataMapper
+        public IDataMapper GetDataMapper()
         {
-            get
-            {
-                return _dataMapperFactory();
-            }
+            return _dataMapperFactory();
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs b/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs
index c813e3bb6..5d9413d87 100644
--- a/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs
+++ b/NzbDrone.Core/SeriesStats/SeriesStatisticsRepository.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Marr.Data;
 using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Core.SeriesStats
@@ -12,18 +11,20 @@ namespace NzbDrone.Core.SeriesStats
 
     public class SeriesStatisticsRepository : ISeriesStatisticsRepository
     {
-        private readonly IDataMapper _dataMapper;
+        private readonly IDatabase _database;
 
         public SeriesStatisticsRepository(IDatabase database)
         {
-            _dataMapper = database.DataMapper;
+            _database = database;
         }
 
         public List<SeriesStatistics> SeriesStatistics()
         {
-            _dataMapper.AddParameter("currentDate", DateTime.UtcNow);
+            var mapper = _database.GetDataMapper();
 
-            var queryText = @"SELECT
+            mapper.AddParameter("currentDate", DateTime.UtcNow);
+
+            const string queryText = @"SELECT
                               SeriesId,
                               SUM(CASE WHEN Monitored = 1 AND Airdate <= @currentDate THEN 1 ELSE 0 END) AS EpisodeCount,
                               SUM(CASE WHEN Monitored = 1 AND Episodes.EpisodeFileId > 0 AND AirDate <= @currentDate THEN 1 ELSE 0 END) as EpisodeFileCount,
@@ -32,7 +33,7 @@ namespace NzbDrone.Core.SeriesStats
                               FROM Episodes
                               GROUP BY SeriesId";
 
-            return _dataMapper.Query<SeriesStatistics>(queryText);
+            return mapper.Query<SeriesStatistics>(queryText);
         }
     }
 }
diff --git a/NzbDrone.Core/Tv/EpisodeRepository.cs b/NzbDrone.Core/Tv/EpisodeRepository.cs
index 178bc4e9c..2c2e8d2db 100644
--- a/NzbDrone.Core/Tv/EpisodeRepository.cs
+++ b/NzbDrone.Core/Tv/EpisodeRepository.cs
@@ -31,12 +31,12 @@ namespace NzbDrone.Core.Tv
 
     public class EpisodeRepository : BasicRepository<Episode>, IEpisodeRepository
     {
-        private readonly IDataMapper _dataMapper;
+        private readonly IDatabase _database;
 
         public EpisodeRepository(IDatabase database, IMessageAggregator messageAggregator)
             : base(database, messageAggregator)
         {
-            _dataMapper = database.DataMapper;
+            _database = database;
         }
 
         public Episode Get(int seriesId, int season, int episodeNumber)
@@ -135,16 +135,18 @@ namespace NzbDrone.Core.Tv
 
         public void SetMonitoredBySeason(int seriesId, int seasonNumber, bool monitored)
         {
-            _dataMapper.AddParameter("seriesId", seriesId);
-            _dataMapper.AddParameter("seasonNumber", seasonNumber);
-            _dataMapper.AddParameter("monitored", monitored);
+            var mapper = _database.GetDataMapper();
 
-            var sql = "UPDATE Episodes " +
-                      "SET Monitored = @monitored " +
-                      "WHERE SeriesId = @seriesId " +
-                      "AND SeasonNumber = @seasonNumber";
+            mapper.AddParameter("seriesId", seriesId);
+            mapper.AddParameter("seasonNumber", seasonNumber);
+            mapper.AddParameter("monitored", monitored);
 
-            _dataMapper.ExecuteNonQuery(sql);
+            const string sql = "UPDATE Episodes " +
+                               "SET Monitored = @monitored " +
+                               "WHERE SeriesId = @seriesId " +
+                               "AND SeasonNumber = @seasonNumber";
+
+            mapper.ExecuteNonQuery(sql);
         }
 
         public void SetFileId(int episodeId, int fileId)