Fix metadata check

Author: JimBobSquarePants

src/ImageSharp.Web/ImageCacheMetadata.cs

@@ -156,13 +156,11 @@ public static async Task<ImageCacheMetadata> ReadAsync(Stream stream)
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool Equals(ImageCacheMetadata other)
-        {
-            return this.SourceLastWriteTimeUtc == other.SourceLastWriteTimeUtc
-                   && this.CacheLastWriteTimeUtc == other.CacheLastWriteTimeUtc
-                   && this.ContentType == other.ContentType
-                   && this.CacheControlMaxAge == other.CacheControlMaxAge
-                   && this.ContentLength == other.ContentLength;
-        }
+            => this.SourceLastWriteTimeUtc == other.SourceLastWriteTimeUtc
+            && this.CacheLastWriteTimeUtc == other.CacheLastWriteTimeUtc
+            && this.ContentType == other.ContentType
+            && this.CacheControlMaxAge == other.CacheControlMaxAge
+            && this.ContentLength == other.ContentLength;
 
         /// <inheritdoc/>
         public override bool Equals(object obj)
@@ -181,16 +179,14 @@ public override int GetHashCode() => HashCode.Combine(
         /// </summary>
         /// <returns>The <see cref="Dictionary{String, String}"/>.</returns>
         public Dictionary<string, string> ToDictionary()
-        {
-            return new Dictionary<string, string>
+            => new()
             {
                 { SourceLastModifiedKey, this.SourceLastWriteTimeUtc.ToString("o") },
                 { CacheLastModifiedKey, this.CacheLastWriteTimeUtc.ToString("o") },
                 { ContentTypeKey, this.ContentType },
                 { CacheControlKey, this.CacheControlMaxAge.TotalSeconds.ToString(NumberFormatInfo.InvariantInfo) },
                 { ContentLengthKey, this.ContentLength.ToString(NumberFormatInfo.InvariantInfo) }
             };
-        }
 
         /// <inheritdoc/>
         public override string ToString()

src/ImageSharp.Web/Resolvers/PhysicalFileSystemCacheResolver.cs

@@ -33,9 +33,9 @@ public PhysicalFileSystemCacheResolver(FileInfo metaFileInfo, FormatUtilities fo
         /// <inheritdoc/>
         public async Task<ImageCacheMetadata> GetMetaDataAsync()
         {
-            using Stream stream = OpenFileStream(this.metaFileInfo.FullName);
             if (this.metadata == default)
             {
+                using Stream stream = OpenFileStream(this.metaFileInfo.FullName);
                 this.metadata = await ImageCacheMetadata.ReadAsync(stream);
             }
 
@@ -49,11 +49,11 @@ public Task<Stream> OpenReadAsync()
                 this.metaFileInfo.FullName,
                 this.formatUtilities.GetExtensionFromContentType(this.metadata.ContentType));
 
-            return Task.FromResult(OpenFileStream(path));
+            return Task.FromResult<Stream>(OpenFileStream(path));
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Stream OpenFileStream(string path)
+        private static FileStream OpenFileStream(string path)
         {
             // We are setting buffer size to 1 to prevent FileStream from allocating it's internal buffer
             // 0 causes constructor to throw