diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py
index 703b2562..8a2e12fd 100644
--- a/mopidy/backends/local/__init__.py
+++ b/mopidy/backends/local/__init__.py
@@ -34,7 +34,7 @@ class Extension(ext.Extension):
         return [LocalBackend]
 
     def get_library_updaters(self):
-        from .library import LocalLibraryUpdateProvider
+        from .tagcache.library import LocalLibraryUpdateProvider
         return [LocalLibraryUpdateProvider]
 
     def get_command(self):
diff --git a/mopidy/backends/local/actor.py b/mopidy/backends/local/actor.py
index f3611891..531b7546 100644
--- a/mopidy/backends/local/actor.py
+++ b/mopidy/backends/local/actor.py
@@ -8,7 +8,7 @@ import pykka
 from mopidy.backends import base
 from mopidy.utils import encoding, path
 
-from .library import LocalLibraryProvider
+from .tagcache.library import LocalLibraryProvider
 from .playlists import LocalPlaylistsProvider
 from .playback import LocalPlaybackProvider
 
diff --git a/mopidy/backends/local/tagcache/__init__.py b/mopidy/backends/local/tagcache/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/mopidy/backends/local/library.py b/mopidy/backends/local/tagcache/library.py
similarity index 98%
rename from mopidy/backends/local/library.py
rename to mopidy/backends/local/tagcache/library.py
index da4e4bfd..b6ec05ff 100644
--- a/mopidy/backends/local/library.py
+++ b/mopidy/backends/local/tagcache/library.py
@@ -8,9 +8,9 @@ from mopidy.backends import base
 from mopidy.frontends.mpd import translator as mpd_translator
 from mopidy.models import Album, SearchResult
 
-from .translator import local_to_file_uri, parse_mpd_tag_cache
+from ..translator import local_to_file_uri, parse_mpd_tag_cache
 
-logger = logging.getLogger('mopidy.backends.local')
+logger = logging.getLogger('mopidy.backends.local.tagcache')
 
 
 class LocalLibraryProvider(base.BaseLibraryProvider):
@@ -219,7 +219,6 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
                     raise LookupError('Missing query')
 
 
-# TODO: rename and move to tagcache extension.
 class LocalLibraryUpdateProvider(base.BaseLibraryProvider):
     uri_schemes = ['local']