diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
index 6fad76c8e..c9d123010 100644
--- a/src/GitHub.Api/Git/Repository.cs
+++ b/src/GitHub.Api/Git/Repository.cs
@@ -58,11 +58,6 @@ public void Initialize(IRepositoryManager initRepositoryManager)
             repositoryManager.OnRemoteBranchAdded += RepositoryManager_OnRemoteBranchAdded;
             repositoryManager.OnRemoteBranchRemoved += RepositoryManager_OnRemoteBranchRemoved;
             repositoryManager.OnGitUserLoaded += user => User = user;
-
-            UpdateGitStatus();
-            UpdateGitLog();
-
-            new ActionTask(CancellationToken.None, UpdateLocks) { Affinity = TaskAffinity.UI }.Start();
         }
 
         public ITask SetupRemote(string remote, string remoteUrl)
@@ -287,12 +282,15 @@ private void CacheContainer_OnCacheInvalidated(CacheType cacheType)
                     break;
 
                 case CacheType.GitLogCache:
+                    UpdateGitLog();
                     break;
 
                 case CacheType.GitStatusCache:
+                    UpdateGitStatus();
                     break;
 
                 case CacheType.GitLocksCache:
+                    UpdateLocks();
                     break;
 
                 case CacheType.GitUserCache: