diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
index 42c8f22a0f..b13cc0e26b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractRepositoryHandler.java
@@ -168,7 +168,7 @@ public abstract class AbstractRepositoryHandler<C extends RepositoryConfig>
    * @throws NotSupportedFeatureException
    */
   @Override
-  public ImportHandler getImportHandler() throws NotSupportedFeatureException
+  public ImportHandler getImportHandler()
   {
     throw new NotSupportedFeatureException("import");
   }
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index b14c7dd3de..17e5d3e24f 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -76,7 +76,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
 
   @Override
   public Repository create(Repository repository) {
-    File nativeDirectory = resolveNativeDirectory(repository);
+    File nativeDirectory = resolveNativeDirectory(repository.getId());
     try {
       create(repository, nativeDirectory);
       postCreate(repository, nativeDirectory);
@@ -106,10 +106,10 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
   }
 
   @Override
-  public File getDirectory(Repository repository) {
+  public File getDirectory(String repositoryId) {
     File directory;
     if (isConfigured()) {
-      directory = resolveNativeDirectory(repository);
+      directory = resolveNativeDirectory(repositoryId);
     } else {
       throw new ConfigurationException("RepositoryHandler is not configured");
     }
@@ -167,7 +167,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
     return content;
   }
 
-  private File resolveNativeDirectory(Repository repository) {
-    return new File(repositoryLocationResolver.getRepositoryDirectory(repository), REPOSITORIES_NATIVE_DIRECTORY);
+  private File resolveNativeDirectory(String repositoryId) {
+    return new File(repositoryLocationResolver.getRepositoryDirectory(repositoryId), REPOSITORIES_NATIVE_DIRECTORY);
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/DirectoryHealthCheck.java b/scm-core/src/main/java/sonia/scm/repository/DirectoryHealthCheck.java
index 0f329d89b2..71f47f2022 100644
--- a/scm-core/src/main/java/sonia/scm/repository/DirectoryHealthCheck.java
+++ b/scm-core/src/main/java/sonia/scm/repository/DirectoryHealthCheck.java
@@ -178,7 +178,7 @@ public abstract class DirectoryHealthCheck implements HealthCheck
       else if (handler instanceof RepositoryDirectoryHandler)
       {
         File directory =
-          ((RepositoryDirectoryHandler) handler).getDirectory(repository);
+          ((RepositoryDirectoryHandler) handler).getDirectory(repository.getId());
 
         if (directory == null)
         {
diff --git a/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java b/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java
index 61318a729f..38f692f0e6 100644
--- a/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java
+++ b/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java
@@ -28,8 +28,8 @@ public class InitialRepositoryLocationResolver {
     this.context = context;
   }
 
-  public InitialRepositoryLocation getRelativeRepositoryPath(Repository repository) {
-    String relativePath = DEFAULT_REPOSITORY_PATH + File.separator + repository.getId();
+  public InitialRepositoryLocation getRelativeRepositoryPath(String repositoryId) {
+    String relativePath = DEFAULT_REPOSITORY_PATH + File.separator + repositoryId;
     return new InitialRepositoryLocation(new File(context.getBaseDirectory(), relativePath), relativePath);
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/PathBasedRepositoryDAO.java b/scm-core/src/main/java/sonia/scm/repository/PathBasedRepositoryDAO.java
index 4889a6ada8..35a47af233 100644
--- a/scm-core/src/main/java/sonia/scm/repository/PathBasedRepositoryDAO.java
+++ b/scm-core/src/main/java/sonia/scm/repository/PathBasedRepositoryDAO.java
@@ -11,7 +11,8 @@ import java.nio.file.Path;
 public interface PathBasedRepositoryDAO extends RepositoryDAO {
 
   /**
-   * Get the current path of the repository. This works for existing repositories only, not for repositories that should be created.
+   * Get the current path of the repository for the given id.
+   * This works for existing repositories only, not for repositories that should be created.
    */
-  Path getPath(Repository repository) ;
+  Path getPath(String repositoryId) ;
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java
index 2052c8c71c..fd8e8a25f3 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java
@@ -43,9 +43,8 @@ import java.io.File;
 public interface RepositoryDirectoryHandler extends RepositoryHandler {
 
   /**
-   * Get the current directory of the given repository
-   * @param repository
+   * Get the current directory of the repository for the given id.
    * @return the current directory of the given repository
    */
-  File getDirectory(Repository repository);
+  File getDirectory(String repositoryId);
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryLocationResolver.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryLocationResolver.java
index 9ac93405ce..8ee601c514 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryLocationResolver.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryLocationResolver.java
@@ -29,15 +29,11 @@ public class RepositoryLocationResolver {
     this.initialRepositoryLocationResolver = initialRepositoryLocationResolver;
   }
 
-  public File getRepositoryDirectory(Repository repository){
+  public File getRepositoryDirectory(String repositoryId) {
     if (repositoryDAO instanceof PathBasedRepositoryDAO) {
       PathBasedRepositoryDAO pathBasedRepositoryDAO = (PathBasedRepositoryDAO) repositoryDAO;
-      return pathBasedRepositoryDAO.getPath(repository).toFile();
+      return pathBasedRepositoryDAO.getPath(repositoryId).toFile();
     }
-    return initialRepositoryLocationResolver.getRelativeRepositoryPath(repository).getAbsolutePath();
-  }
-
-  public File getRepositoryDirectory(String repositoryId) {
-    return getRepositoryDirectory(repositoryDAO.get(repositoryId));
+    return initialRepositoryLocationResolver.getRelativeRepositoryPath(repositoryId).getAbsolutePath();
   }
 }
diff --git a/scm-core/src/test/java/sonia/scm/repository/InitialRepositoryLocationResolverTest.java b/scm-core/src/test/java/sonia/scm/repository/InitialRepositoryLocationResolverTest.java
index dc596980cf..56186ef888 100644
--- a/scm-core/src/test/java/sonia/scm/repository/InitialRepositoryLocationResolverTest.java
+++ b/scm-core/src/test/java/sonia/scm/repository/InitialRepositoryLocationResolverTest.java
@@ -32,9 +32,7 @@ public class InitialRepositoryLocationResolverTest {
   @Test
   public void shouldComputeInitialDirectory() {
     InitialRepositoryLocationResolver resolver = new InitialRepositoryLocationResolver(context);
-    Repository repository = new Repository();
-    repository.setId("ABC");
-    InitialRepositoryLocationResolver.InitialRepositoryLocation directory = resolver.getRelativeRepositoryPath(repository);
+    InitialRepositoryLocationResolver.InitialRepositoryLocation directory = resolver.getRelativeRepositoryPath("ABC");
 
     assertThat(directory.getAbsolutePath()).isEqualTo(new File(context.getBaseDirectory(), "repositories/ABC"));
     assertThat(directory.getRelativePath()).isEqualTo( "repositories/ABC");
diff --git a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java
index 0ae24a0b93..c83de49525 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java
@@ -35,7 +35,7 @@ package sonia.scm.repository.xml;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import sonia.scm.NotFoundException;
+import sonia.scm.ContextEntry;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.io.FileSystem;
 import sonia.scm.repository.InitialRepositoryLocationResolver;
@@ -47,14 +47,11 @@ import sonia.scm.repository.Repository;
 import sonia.scm.store.ConfigurationStoreFactory;
 import sonia.scm.xml.AbstractXmlDAO;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
 
-import static sonia.scm.ContextEntry.ContextBuilder.entity;
-
 /**
  * @author Sebastian Sdorra
  */
@@ -104,7 +101,7 @@ public class XmlRepositoryDAO
 
   @Override
   public void modify(Repository repository) {
-    RepositoryPath repositoryPath = findExistingRepositoryPath(repository).orElseThrow(() -> new InternalRepositoryException(repository, "path object for repository not found"));
+    RepositoryPath repositoryPath = findExistingRepositoryPath(repository.getId()).orElseThrow(() -> new InternalRepositoryException(repository, "path object for repository not found"));
     repositoryPath.setRepository(repository);
     repositoryPath.setToBeSynchronized(true);
     storeDB();
@@ -112,7 +109,7 @@ public class XmlRepositoryDAO
 
   @Override
   public void add(Repository repository) {
-    InitialRepositoryLocation initialLocation = initialRepositoryLocationResolver.getRelativeRepositoryPath(repository);
+    InitialRepositoryLocation initialLocation = initialRepositoryLocationResolver.getRelativeRepositoryPath(repository.getId());
     try {
       fileSystem.create(initialLocation.getAbsolutePath());
     } catch (IOException e) {
@@ -153,7 +150,7 @@ public class XmlRepositoryDAO
 
   @Override
   public void delete(Repository repository) {
-    Path directory = getPath(repository);
+    Path directory = getPath(repository.getId());
     super.delete(repository);
     try {
         fileSystem.destroy(directory.toFile());
@@ -173,19 +170,19 @@ public class XmlRepositoryDAO
   }
 
   @Override
-  public Path getPath(Repository repository) {
+  public Path getPath(String repositoryId) {
     return context
       .getBaseDirectory()
       .toPath()
       .resolve(
-        findExistingRepositoryPath(repository)
+        findExistingRepositoryPath(repositoryId)
           .map(RepositoryPath::getPath)
-          .orElseThrow(() -> new InternalRepositoryException(repository, "could not find base directory for repository")));
+          .orElseThrow(() -> new InternalRepositoryException(ContextEntry.ContextBuilder.entity("repository", repositoryId), "could not find base directory for repository")));
   }
 
-  private Optional<RepositoryPath> findExistingRepositoryPath(Repository repository) {
+  private Optional<RepositoryPath> findExistingRepositoryPath(String repositoryId) {
     return db.values().stream()
-      .filter(repoPath -> repoPath.getId().equals(repository.getId()))
+      .filter(repoPath -> repoPath.getId().equals(repositoryId))
       .findAny();
   }
 }
diff --git a/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java b/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java
index 25a4566ed1..145e7dfa8d 100644
--- a/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java
+++ b/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java
@@ -89,7 +89,7 @@ public class XmlRepositoryDAOTest {
 
     XmlRepositoryDAO dao = new XmlRepositoryDAO(storeFactory, new InitialRepositoryLocationResolver(context), fileSystem, context);
 
-    Path path = dao.getPath(existingRepository);
+    Path path = dao.getPath(existingRepository.getId());
 
     assertThat(path.toString()).isEqualTo(context.getBaseDirectory().getPath() + "/path");
   }
@@ -102,7 +102,7 @@ public class XmlRepositoryDAOTest {
 
     XmlRepositoryDAO dao = new XmlRepositoryDAO(storeFactory, new InitialRepositoryLocationResolver(context), fileSystem, context);
 
-    Path path = dao.getPath(existingRepository);
+    Path path = dao.getPath(existingRepository.getId());
 
     assertThat(path.toString()).isEqualTo("/tmp/path");
   }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitGcTask.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitGcTask.java
index 248eae92d1..9a30cc9f3e 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitGcTask.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitGcTask.java
@@ -121,7 +121,7 @@ public class GitGcTask implements Runnable {
   }
 
   private void gc(Repository repository){
-    File file = repositoryHandler.getDirectory(repository);
+    File file = repositoryHandler.getDirectory(repository.getId());
     Git git = null;
     try {
       git = open(file);
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java
index 3cf72166ea..348203af92 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitIncomingOutgoingCommand.java
@@ -119,7 +119,7 @@ public abstract class AbstractGitIncomingOutgoingCommand
 
     Git git = Git.wrap(open());
 
-    GitUtil.fetch(git, handler.getDirectory(remoteRepository), remoteRepository);
+    GitUtil.fetch(git, handler.getDirectory(remoteRepository.getId()), remoteRepository);
 
     ObjectId localId = getDefaultBranch(git.getRepository());
     ObjectId remoteId = null;
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java
index e4e37d6fed..a9b9e25aca 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitPushOrPullCommand.java
@@ -196,7 +196,7 @@ public abstract class AbstractGitPushOrPullCommand extends AbstractGitCommand
    */
   protected String getRemoteUrl(sonia.scm.repository.Repository repository)
   {
-    return getRemoteUrl(handler.getDirectory(repository));
+    return getRemoteUrl(handler.getDirectory(repository.getId()));
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
index 7a829355bf..8810c15c58 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitPullCommand.java
@@ -196,12 +196,12 @@ public class GitPullCommand extends AbstractGitPushOrPullCommand
   private PullResponse pullFromScmRepository(Repository sourceRepository)
     throws IOException
   {
-    File sourceDirectory = handler.getDirectory(sourceRepository);
+    File sourceDirectory = handler.getDirectory(sourceRepository.getId());
 
     Preconditions.checkArgument(sourceDirectory.exists(),
       "source repository directory does not exists");
 
-    File targetDirectory = handler.getDirectory(repository);
+    File targetDirectory = handler.getDirectory(repository.getId());
 
     Preconditions.checkArgument(sourceDirectory.exists(),
       "target repository directory does not exists");
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
index bda0d87b21..ae1af333bc 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
@@ -73,7 +73,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
   public GitRepositoryServiceProvider(GitRepositoryHandler handler, Repository repository) {
     this.handler = handler;
     this.repository = repository;
-    this.context = new GitContext(handler.getDirectory(repository), repository);
+    this.context = new GitContext(handler.getDirectory(repository.getId()), repository);
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
index eb57ac8ff8..a2114a1b6a 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryResolver.java
@@ -106,7 +106,7 @@ public class GitRepositoryResolver implements RepositoryResolver<HttpServletRequ
 
       if (config.isValid())
       {
-        File gitdir = handler.getDirectory(repo);
+        File gitdir = handler.getDirectory(repo.getId());
         if (gitdir == null) {
           throw new RepositoryNotFoundException(repositoryName);
         }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
index 5a1a780267..bfff7d3bf1 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
@@ -111,7 +111,7 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
     repositoryHandler.setConfig(config);
 
     initRepository();
-    File path = repositoryHandler.getDirectory(repository);
+    File path = repositoryHandler.getDirectory(repository.getId());
     assertEquals(repoPath.toString() + File.separator + AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractRemoteCommandTestBase.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractRemoteCommandTestBase.java
index 97e09c0708..1e366c919b 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractRemoteCommandTestBase.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/AbstractRemoteCommandTestBase.java
@@ -92,9 +92,9 @@ public class AbstractRemoteCommandTestBase
     outgoing = Git.init().setDirectory(outgoingDirectory).setBare(false).call();
 
     handler = mock(GitRepositoryHandler.class);
-    when(handler.getDirectory(incomingRepository)).thenReturn(
+    when(handler.getDirectory(incomingRepository.getId())).thenReturn(
       incomingDirectory);
-    when(handler.getDirectory(outgoingRepository)).thenReturn(
+    when(handler.getDirectory(outgoingRepository.getId())).thenReturn(
       outgoingDirectory);
   }
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
index 4115a514a2..832a7203f8 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/AbstractHgHandler.java
@@ -124,7 +124,7 @@ public class AbstractHgHandler
   protected AbstractHgHandler(HgRepositoryHandler handler, HgContext context,
     Repository repository)
   {
-    this(handler, context, repository, handler.getDirectory(repository));
+    this(handler, context, repository, handler.getDirectory(repository.getId()));
   }
 
   /**
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
index f337237dba..533adbac82 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
@@ -114,7 +114,6 @@ public class HgRepositoryHandler
                              RepositoryLocationResolver repositoryLocationResolver)
   {
     super(storeFactory, repositoryLocationResolver);
-    this.repositoryLocationResolver = repositoryLocationResolver;
     this.hgContextProvider = hgContextProvider;
 
     try
@@ -428,10 +427,6 @@ public class HgRepositoryHandler
     }
   }
 
-  public File getDirectory(String repositoryId) {
-    return repositoryLocationResolver.getRepositoryDirectory(repositoryId);
-  }
-
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
@@ -439,6 +434,4 @@ public class HgRepositoryHandler
 
   /** Field description */
   private JAXBContext jaxbContext;
-
-  private final RepositoryLocationResolver repositoryLocationResolver;
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/AbstractHgPushOrPullCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/AbstractHgPushOrPullCommand.java
index 43fb759433..4782d03756 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/AbstractHgPushOrPullCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/AbstractHgPushOrPullCommand.java
@@ -78,7 +78,7 @@ public class AbstractHgPushOrPullCommand extends AbstractCommand
     if (repo != null)
     {
       url =
-        handler.getDirectory(request.getRemoteRepository()).getAbsolutePath();
+        handler.getDirectory(request.getRemoteRepository().getId()).getAbsolutePath();
     }
     else if (request.getRemoteUrl() != null)
     {
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
index c60f2c5712..52a4ddf261 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgIncomingCommand.java
@@ -81,7 +81,7 @@ public class HgIncomingCommand extends AbstractCommand
   @Override
   @SuppressWarnings("unchecked")
   public ChangesetPagingResult getIncomingChangesets(IncomingCommandRequest request) {
-    File remoteRepository = handler.getDirectory(request.getRemoteRepository());
+    File remoteRepository = handler.getDirectory(request.getRemoteRepository().getId());
 
     com.aragost.javahg.Repository repository = open();
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
index 81bee6b9ff..4bbf30e936 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java
@@ -83,7 +83,7 @@ public class HgOutgoingCommand extends AbstractCommand
   public ChangesetPagingResult getOutgoingChangesets(
     OutgoingCommandRequest request)
   {
-    File remoteRepository = handler.getDirectory(request.getRemoteRepository());
+    File remoteRepository = handler.getDirectory(request.getRemoteRepository().getId());
 
     com.aragost.javahg.Repository repository = open();
 
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
index cf9beb5a0c..2c18aea2c3 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
@@ -81,7 +81,7 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
   {
     this.repository = repository;
     this.handler = handler;
-    this.repositoryDirectory = handler.getDirectory(repository);
+    this.repositoryDirectory = handler.getDirectory(repository.getId());
     this.context = new HgCommandContext(hookManager, handler, repository,
       repositoryDirectory);
   }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
index 1d4154ca9e..4119c3396c 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
@@ -253,8 +253,7 @@ public class HgCGIServlet extends HttpServlet implements ScmProviderHttpServlet
     HttpServletResponse response, Repository repository)
     throws IOException, ServletException
   {
-    String name = repository.getName();
-    File directory = handler.getDirectory(repository);
+    File directory = handler.getDirectory(repository.getId());
     CGIExecutor executor = cgiExecutorFactory.createExecutor(configuration,
                              getServletContext(), request, response);
 
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java
index 4ef21d2784..b8b9646a90 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java
@@ -93,7 +93,7 @@ public class HgRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
     repositoryHandler.setConfig(hgConfig);
 
     initRepository();
-    File path = repositoryHandler.getDirectory(repository);
+    File path = repositoryHandler.getDirectory(repository.getId());
     assertEquals(repoPath.toString() + File.separator + AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/IncomingOutgoingTestBase.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/IncomingOutgoingTestBase.java
index 163a236d77..6c654b0e54 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/IncomingOutgoingTestBase.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/IncomingOutgoingTestBase.java
@@ -94,9 +94,9 @@ public abstract class IncomingOutgoingTestBase extends AbstractTestBase
     outgoing = Repository.create(createConfig(temp), outgoingDirectory);
 
     handler = mock(HgRepositoryHandler.class);
-    when(handler.getDirectory(incomingRepository)).thenReturn(
+    when(handler.getDirectory(incomingRepository.getId())).thenReturn(
       incomingDirectory);
-    when(handler.getDirectory(outgoingRepository)).thenReturn(
+    when(handler.getDirectory(outgoingRepository.getId())).thenReturn(
       outgoingDirectory);
     when(handler.getConfig()).thenReturn(temp.getConfig());
     when(handler.getHgContext()).thenReturn(new HgContext());
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java
index 5c1a076ddc..ff277947bd 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnRepositoryServiceProvider.java
@@ -63,7 +63,7 @@ public class SvnRepositoryServiceProvider extends RepositoryServiceProvider
     Repository repository)
   {
     this.repository = repository;
-    this.context = new SvnContext(handler.getDirectory(repository));
+    this.context = new SvnContext(handler.getDirectory(repository.getId()));
   }
 
   //~--- methods --------------------------------------------------------------
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVConfig.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVConfig.java
index b220737ecb..a544e8051b 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVConfig.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVConfig.java
@@ -292,7 +292,7 @@ public class SvnDAVConfig extends DAVConfig
 
     if (repository != null)
     {
-      directory = handler.getDirectory(repository);
+      directory = handler.getDirectory(repository.getId());
     }
 
     return directory;
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
index eaa7394ae5..bfc8bbc428 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
@@ -115,7 +115,7 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
     repositoryHandler.setConfig(svnConfig);
 
     initRepository();
-    File path = repositoryHandler.getDirectory(repository);
+    File path = repositoryHandler.getDirectory(repository.getId());
     assertEquals(repoPath.toString()+File.separator+ AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
   }
 }
diff --git a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
index e479fae941..706117b2c7 100644
--- a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
@@ -100,7 +100,7 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase {
     repository = RepositoryTestData.createHeartOfGold();
     File repoDirectory = new File(baseDirectory, repository.getId());
     repoPath = repoDirectory.toPath();
-    when(repoDao.getPath(repository)).thenReturn(repoPath);
+    when(repoDao.getPath(repository.getId())).thenReturn(repoPath);
     return new File(repoDirectory, AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
   }