From bc747ed454841676e5efe6f38036dd90c7d0eab4 Mon Sep 17 00:00:00 2001
From: Andrew Nielsen <anielsen@microsoft.com>
Date: Wed, 22 Jan 2020 12:12:49 -0800
Subject: [PATCH] FileCache.InitializeTypeAsync(Stream...) should not return
 null. It should return `Task.FromResult<StorageFile>(null)`. Otherwise,
 CacheBase attempts to dereference the Task to call ConfigureAwait(false)
 which results in a NullReferenceException.

---
 Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs b/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
index c87ac8d315e..ca6364e6a96 100644
--- a/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
@@ -34,7 +34,7 @@ public class FileCache : CacheBase<StorageFile>
         protected override Task<StorageFile> InitializeTypeAsync(Stream stream, List<KeyValuePair<string, object>> initializerKeyValues = null)
         {
             // nothing to do in this instance;
-            return null;
+            return Task.FromResult<StorageFile>(null);
         }
 
         /// <summary>
@@ -45,7 +45,7 @@ protected override Task<StorageFile> InitializeTypeAsync(Stream stream, List<Key
         /// <returns>awaitable task</returns>
         protected override Task<StorageFile> InitializeTypeAsync(StorageFile baseFile, List<KeyValuePair<string, object>> initializerKeyValues = null)
         {
-            return Task.Run(() => baseFile);
+            return Task.FromResult(baseFile);
         }
     }
 }