diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
index 388ab55fa..0b2fa7a41 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -107,11 +107,9 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastStatusChangedEvent = cacheUpdateEvent;
-                    currentStatusHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastStatusChangedEvent = cacheUpdateEvent;
+                currentStatusHasUpdate = true;
+                Redraw();
             }
         }
 
@@ -119,11 +117,9 @@ private void RepositoryOnCurrentBranchChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCurrentBranchChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastCurrentBranchChangedEvent = cacheUpdateEvent;
-                    currentBranchHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentBranchChangedEvent = cacheUpdateEvent;
+                currentBranchHasUpdate = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
index 434e2e79d..ce0c4c07e 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -296,11 +296,9 @@ private void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastStatusChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastStatusChangedEvent = cacheUpdateEvent;
-                    currentStatusHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastStatusChangedEvent = cacheUpdateEvent;
+                currentStatusHasUpdate = true;
+                Redraw();
             }
         }
 
@@ -308,11 +306,9 @@ private void RepositoryOnLogChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLogChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastLogChangedEvent = cacheUpdateEvent;
-                    currentLogHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastLogChangedEvent = cacheUpdateEvent;
+                currentLogHasUpdate = true;
+                Redraw();
             }
         }
 
@@ -320,11 +316,9 @@ private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastCurrentRemoteChangedEvent = cacheUpdateEvent;
-                    currentRemoteHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentRemoteChangedEvent = cacheUpdateEvent;
+                currentRemoteHasUpdate = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs
index b6175d6de..e6ed0a5e4 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs
@@ -95,13 +95,9 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () =>
-                    {
-                        lastCheckUserChangedEvent = cacheUpdateEvent;
-                        userHasChanges = true;
-                        Redraw();
-                    })
-                    { Affinity = TaskAffinity.UI }.Start();
+                lastCheckUserChangedEvent = cacheUpdateEvent;
+                userHasChanges = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
index ec838d6ee..f92c2a27c 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -45,14 +45,10 @@ private static void RepositoryOnStatusChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastRepositoryStatusChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(CancellationToken.None, () =>
-                {
-                    lastRepositoryStatusChangedEvent = cacheUpdateEvent;
-                    entries.Clear();
-                    entries.AddRange(repository.CurrentStatus.Entries);
-                    OnStatusUpdate();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                lastRepositoryStatusChangedEvent = cacheUpdateEvent;
+                entries.Clear();
+                entries.AddRange(repository.CurrentStatus.Entries);
+                OnStatusUpdate();
             }
         }
 
@@ -60,13 +56,9 @@ private static void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(CancellationToken.None, () =>
-                {
-                    lastLocksChangedEvent = cacheUpdateEvent;
-                    locks = repository.CurrentLocks;
-                    OnLocksUpdate();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                lastLocksChangedEvent = cacheUpdateEvent;
+                locks = repository.CurrentLocks;
+                OnLocksUpdate();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
index 91afd8fe0..3fb2541b9 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -126,11 +126,9 @@ private void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastLocksChangedEvent = cacheUpdateEvent;
-                    currentLocksHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastLocksChangedEvent = cacheUpdateEvent;
+                currentLocksHasUpdate = true;
+                Redraw();
             }
         }
 
@@ -138,11 +136,9 @@ private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                    lastCurrentRemoteChangedEvent = cacheUpdateEvent;
-                    currentRemoteHasUpdate = true;
-                    Redraw();
-                }) { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentRemoteChangedEvent = cacheUpdateEvent;
+                currentRemoteHasUpdate = true;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs
index f280b5eda..825d35399 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs
@@ -96,13 +96,10 @@ private void UserOnChanged(CacheUpdateEvent cacheUpdateEvent)
 
             if (!lastCheckUserChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () => {
-                        lastCheckUserChangedEvent = cacheUpdateEvent;
-                        userHasChanges = true;
-                        isBusy = false;
-                        Redraw();
-                    })
-                    { Affinity = TaskAffinity.UI }.Start();
+                lastCheckUserChangedEvent = cacheUpdateEvent;
+                userHasChanges = true;
+                isBusy = false;
+                Redraw();
             }
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
index 689792c12..7aa51e42b 100644
--- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
+++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -270,13 +270,9 @@ private void RepositoryOnCurrentBranchAndRemoteChanged(CacheUpdateEvent cacheUpd
         {
             if (!lastCurrentBranchAndRemoteChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () =>
-                {
-                    lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;
-                    currentBranchAndRemoteHasUpdate = true;
-                    Redraw();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                lastCurrentBranchAndRemoteChangedEvent = cacheUpdateEvent;
+                currentBranchAndRemoteHasUpdate = true;
+                Redraw();
             }
         }