The bug I was hoping to fix

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs

@@ -10,6 +10,7 @@
 namespace GitHub.Unity
 {
     internal sealed class ApplicationCache : ScriptableObject
+        //, ISerializationCallbackReceiver
     {
         private static ApplicationCache instance;
 
@@ -54,6 +55,13 @@ private static ApplicationCache CreateInstance()
         [SerializeField] public bool Initialized;
 
         [SerializeField] public string CreatedDate;
+        public static Texture2D LockedModifiedStatusIcon;
+        public static Texture2D LockedStatusIcon;
+        public static Texture2D ModifiedStatusIcon;
+        public static Texture2D AddedStatusIcon;
+        public static Texture2D DeletedStatusIcon;
+        public static Texture2D RenamedStatusIcon;
+        public static Texture2D UntrackedStatusIcon;
 
         public void Initialize()
         {
@@ -72,12 +80,21 @@ private static string GetCachePath()
 
         private void OnDisable()
         {
-            Debug.Log("ApplicationCache Disable");
+            Debug.Log("ApplicationCache OnDisable");
             if (instance != null)
             {
                 UnityEditorInternal.InternalEditorUtility.SaveToSerializedFileAndForget(new Object[] { instance }, GetCachePath(), true);
             }
         }
+
+//        public void OnBeforeSerialize()
+//        {
+//            Debug.Log("ApplicationCache OnBeforeSerialize");
+//        }
+//
+//        public void OnAfterDeserialize()
+//        {
+//        }
     }
 
     [InitializeOnLoad]

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -783,25 +783,25 @@ public static Texture2D GetFileStatusIcon(GitFileStatus status, bool isLocked)
                 switch (status)
                 {
                     case GitFileStatus.Modified:
-                        return Utility.GetIcon("locked.png", "[email protected]");
+                        return ApplicationCache.LockedModifiedStatusIcon = ApplicationCache.LockedModifiedStatusIcon ?? Utility.GetIcon("locked.png", "[email protected]");
 
                     default:
-                        return Utility.GetIcon("locked-by-person.png", "[email protected]");
+                        return ApplicationCache.LockedStatusIcon = ApplicationCache.LockedStatusIcon ?? Utility.GetIcon("locked-by-person.png", "[email protected]");
                 }
             }
 
             switch (status)
             {
                 case GitFileStatus.Modified:
-                    return Utility.GetIcon("modified.png", "[email protected]");
+                    return ApplicationCache.ModifiedStatusIcon = ApplicationCache.ModifiedStatusIcon ?? Utility.GetIcon("modified.png", "[email protected]");
                 case GitFileStatus.Added:
-                    return Utility.GetIcon("added.png", "[email protected]");
+                    return ApplicationCache.AddedStatusIcon = ApplicationCache.AddedStatusIcon ?? Utility.GetIcon("added.png", "[email protected]");
                 case GitFileStatus.Deleted:
-                    return Utility.GetIcon("removed.png", "[email protected]");
+                    return ApplicationCache.DeletedStatusIcon = ApplicationCache.DeletedStatusIcon ?? Utility.GetIcon("removed.png", "[email protected]");
                 case GitFileStatus.Renamed:
-                    return Utility.GetIcon("renamed.png", "[email protected]");
+                    return ApplicationCache.RenamedStatusIcon = ApplicationCache.RenamedStatusIcon ?? Utility.GetIcon("renamed.png", "[email protected]");
                 case GitFileStatus.Untracked:
-                    return Utility.GetIcon("untracked.png", "[email protected]");
+                    return ApplicationCache.UntrackedStatusIcon = ApplicationCache.UntrackedStatusIcon ?? Utility.GetIcon("untracked.png", "[email protected]");
             }
 
             return null;