diff --git a/framework/core/spec/Flarum/Core/Settings/CachedSettingsRepositorySpec.php b/framework/core/spec/Flarum/Core/Settings/MemoryCacheSettingsRepositorySpec.php
similarity index 89%
rename from framework/core/spec/Flarum/Core/Settings/CachedSettingsRepositorySpec.php
rename to framework/core/spec/Flarum/Core/Settings/MemoryCacheSettingsRepositorySpec.php
index 4119fcee6..7459b9e33 100644
--- a/framework/core/spec/Flarum/Core/Settings/CachedSettingsRepositorySpec.php
+++ b/framework/core/spec/Flarum/Core/Settings/MemoryCacheSettingsRepositorySpec.php
@@ -6,7 +6,7 @@ use Flarum\Core\Settings\SettingsRepository;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 
-class CachedSettingsRepositorySpec extends ObjectBehavior
+class MemoryCacheSettingsRepositorySpec extends ObjectBehavior
 {
     function let(SettingsRepository $inner)
     {
@@ -15,7 +15,7 @@ class CachedSettingsRepositorySpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Flarum\Core\Settings\CachedSettingsRepository');
+        $this->shouldHaveType('Flarum\Core\Settings\MemoryCacheSettingsRepository');
     }
 
     function it_retrieves_data_from_inner(SettingsRepository $inner)
diff --git a/framework/core/src/Core/CoreServiceProvider.php b/framework/core/src/Core/CoreServiceProvider.php
index cb49ded2b..ed3618bab 100644
--- a/framework/core/src/Core/CoreServiceProvider.php
+++ b/framework/core/src/Core/CoreServiceProvider.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Core;
 
-use Flarum\Core\Settings\CachedSettingsRepository;
+use Flarum\Core\Settings\MemoryCacheSettingsRepository;
 use Flarum\Core\Settings\DatabaseSettingsRepository;
 use Flarum\Core\Users\User;
 use Flarum\Support\ServiceProvider;
@@ -34,7 +34,7 @@ class CoreServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app->singleton('Flarum\Core\Settings\SettingsRepository', function() {
-            return new CachedSettingsRepository(
+            return new MemoryCacheSettingsRepository(
                 new DatabaseSettingsRepository(
                     $this->app->make('Illuminate\Database\ConnectionInterface')
                 )
diff --git a/framework/core/src/Core/Settings/CachedSettingsRepository.php b/framework/core/src/Core/Settings/MemoryCacheSettingsRepository.php
similarity index 92%
rename from framework/core/src/Core/Settings/CachedSettingsRepository.php
rename to framework/core/src/Core/Settings/MemoryCacheSettingsRepository.php
index 0f5cb3c8f..777a7f5c7 100644
--- a/framework/core/src/Core/Settings/CachedSettingsRepository.php
+++ b/framework/core/src/Core/Settings/MemoryCacheSettingsRepository.php
@@ -2,7 +2,7 @@
 
 namespace Flarum\Core\Settings;
 
-class CachedSettingsRepository implements SettingsRepository
+class MemoryCacheSettingsRepository implements SettingsRepository
 {
     protected $inner;