diff --git a/samples/GeekLearning.Storage.BasicSample/Controllers/SampleController.cs b/samples/GeekLearning.Storage.BasicSample/Controllers/SampleController.cs
index 433bb5a..58c60fa 100644
--- a/samples/GeekLearning.Storage.BasicSample/Controllers/SampleController.cs
+++ b/samples/GeekLearning.Storage.BasicSample/Controllers/SampleController.cs
@@ -17,14 +17,14 @@ public SampleController(IStorageFactory storageFactory)
         }
 
         [HttpGet]
-        public async Task<IEnumerable<string>> Get()
+        public async ValueTask<IEnumerable<string>> Get()
         {
             var summaries = await this.sharedAssets.ListAsync("summaries", "*.txt", recursive: true, withMetadata: false);
             return summaries.Select(x => x.Path);
         }
 
         [HttpGet]
-        public async Task<string> Get(string path)
+        public async ValueTask<string> Get(string path)
         {
             var summary = await this.sharedAssets.GetAsync(path);
             return await summary.ReadAllTextAsync();
diff --git a/samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs b/samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs
index affe249..1550312 100644
--- a/samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs
+++ b/samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs
@@ -16,13 +16,13 @@ public ValuesController(TemplatesStore templates)
         }
 
         [HttpGet]
-        public async Task<IEnumerable<string>> Get()
+        public async ValueTask<IEnumerable<string>> Get()
         {
             return new string[] { await templates.Store.ReadAllTextAsync("json.json"), "value2" };
         }
 
         [HttpGet("files")]
-        public async Task<IEnumerable<string>> Get(int id)
+        public async ValueTask<IEnumerable<string>> Get(int id)
         {
             var files = await templates.Store.ListAsync("");
             return files.Select(x => x.PublicUrl);
diff --git a/src/GeekLearning.Storage.Azure/AzureStore.cs b/src/GeekLearning.Storage.Azure/AzureStore.cs
index 0554c2f..b345a9a 100644
--- a/src/GeekLearning.Storage.Azure/AzureStore.cs
+++ b/src/GeekLearning.Storage.Azure/AzureStore.cs
@@ -47,7 +47,7 @@ public Task InitAsync()
             return this.container.Value.CreateIfNotExistsAsync(accessType, null, null);
         }
 
-        public async Task<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata)
+        public async ValueTask<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata)
         {
             if (string.IsNullOrWhiteSpace(path))
             {
@@ -75,7 +75,7 @@ public async Task<IFileReference[]> ListAsync(string path, bool recursive, bool
             return results.OfType<ICloudBlob>().Select(blob => new Internal.AzureFileReference(blob, withMetadata: withMetadata)).ToArray();
         }
 
-        public async Task<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata)
+        public async ValueTask<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata)
         {
             if (string.IsNullOrWhiteSpace(path))
             {
@@ -121,12 +121,12 @@ public async Task<IFileReference[]> ListAsync(string path, string searchPattern,
             return filteredResults.Files.Select(x => pathMap[path + x.Path]).ToArray();
         }
 
-        public async Task<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata)
+        public async ValueTask<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata)
         {
             return await this.InternalGetAsync(file, withMetadata);
         }
 
-        public async Task<IFileReference> GetAsync(Uri uri, bool withMetadata)
+        public async ValueTask<IFileReference> GetAsync(Uri uri, bool withMetadata)
         {
             return await this.InternalGetAsync(uri, withMetadata);
         }
@@ -137,25 +137,25 @@ public async Task DeleteAsync(IPrivateFileReference file)
             await fileReference.DeleteAsync();
         }
 
-        public async Task<Stream> ReadAsync(IPrivateFileReference file)
+        public async ValueTask<Stream> ReadAsync(IPrivateFileReference file)
         {
             var fileReference = await this.InternalGetAsync(file);
             return await fileReference.ReadInMemoryAsync();
         }
 
-        public async Task<byte[]> ReadAllBytesAsync(IPrivateFileReference file)
+        public async ValueTask<byte[]> ReadAllBytesAsync(IPrivateFileReference file)
         {
             var fileReference = await this.InternalGetAsync(file);
             return await fileReference.ReadAllBytesAsync();
         }
 
-        public async Task<string> ReadAllTextAsync(IPrivateFileReference file)
+        public async ValueTask<string> ReadAllTextAsync(IPrivateFileReference file)
         {
             var fileReference = await this.InternalGetAsync(file);
             return await fileReference.ReadAllTextAsync();
         }
 
-        public async Task<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType)
+        public async ValueTask<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType)
         {
             using (var stream = new SyncMemoryStream(data, 0, data.Length))
             {
@@ -163,7 +163,7 @@ public async Task<IFileReference> SaveAsync(byte[] data, IPrivateFileReference f
             }
         }
 
-        public async Task<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType)
+        public async ValueTask<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType)
         {
             var blockBlob = this.container.Value.GetBlockBlobReference(file.Path);
 
@@ -182,7 +182,7 @@ public async Task<IFileReference> SaveAsync(Stream data, IPrivateFileReference f
             return reference;
         }
 
-        public Task<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy)
+        public ValueTask<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy)
         {
             var adHocPolicy = new SharedAccessBlobPolicy()
             {
@@ -191,7 +191,7 @@ public Task<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy)
                 Permissions = FromGenericToAzure(policy.Permissions),
             };
 
-            return Task.FromResult(this.container.Value.GetSharedAccessSignature(adHocPolicy));
+            return new ValueTask<string>(this.container.Value.GetSharedAccessSignature(adHocPolicy));
         }
 
         internal static SharedAccessBlobPermissions FromGenericToAzure(SharedAccessPermissions permissions)
@@ -231,10 +231,9 @@ internal static SharedAccessBlobPermissions FromGenericToAzure(SharedAccessPermi
             return result;
         }
 
-        private async Task<Internal.AzureFileReference> InternalGetAsync(IPrivateFileReference file, bool withMetadata = false)
+        private async ValueTask<Internal.AzureFileReference> InternalGetAsync(IPrivateFileReference file, bool withMetadata = false)
         {
-            var azureFile = file as Internal.AzureFileReference;
-            if (azureFile != null)
+            if (file is Internal.AzureFileReference azureFile)
             {
                 return azureFile;
             }
@@ -242,7 +241,7 @@ internal static SharedAccessBlobPermissions FromGenericToAzure(SharedAccessPermi
             return await this.InternalGetAsync(new Uri(file.Path, UriKind.Relative), withMetadata);
         }
 
-        private async Task<Internal.AzureFileReference> InternalGetAsync(Uri uri, bool withMetadata)
+        private async ValueTask<Internal.AzureFileReference> InternalGetAsync(Uri uri, bool withMetadata)
         {
             try
             {
diff --git a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.csproj b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.csproj
index 05046db..3bb06fd 100644
--- a/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.csproj
+++ b/src/GeekLearning.Storage.Azure/GeekLearning.Storage.Azure.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="1.1.1" />
-    <PackageReference Include="WindowsAzure.Storage" Version="8.1.1" />
+    <PackageReference Include="WindowsAzure.Storage" Version="8.1.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
diff --git a/src/GeekLearning.Storage.Azure/Internal/AzureFileReference.cs b/src/GeekLearning.Storage.Azure/Internal/AzureFileReference.cs
index 01f60c8..eebbb59 100644
--- a/src/GeekLearning.Storage.Azure/Internal/AzureFileReference.cs
+++ b/src/GeekLearning.Storage.Azure/Internal/AzureFileReference.cs
@@ -43,12 +43,12 @@ public Task DeleteAsync()
             return this.CloudBlob.DeleteAsync();
         }
 
-        public async Task<Stream> ReadAsync()
+        public async ValueTask<Stream> ReadAsync()
         {
             return await this.ReadInMemoryAsync();
         }
 
-        public async Task<MemoryStream> ReadInMemoryAsync()
+        public async ValueTask<MemoryStream> ReadInMemoryAsync()
         {
             var memoryStream = new MemoryStream();
             await this.CloudBlob.DownloadRangeToStreamAsync(memoryStream, null, null);
@@ -66,7 +66,7 @@ public async Task ReadToStreamAsync(Stream targetStream)
             await this.CloudBlob.DownloadRangeToStreamAsync(targetStream, null, null);
         }
 
-        public async Task<string> ReadAllTextAsync()
+        public async ValueTask<string> ReadAllTextAsync()
         {
             using (var reader = new StreamReader(await this.CloudBlob.OpenReadAsync(AccessCondition.GenerateEmptyCondition(), new BlobRequestOptions(), new OperationContext())))
             {
@@ -74,7 +74,7 @@ public async Task<string> ReadAllTextAsync()
             }
         }
 
-        public async Task<byte[]> ReadAllBytesAsync()
+        public async ValueTask<byte[]> ReadAllBytesAsync()
         {
             return (await this.ReadInMemoryAsync()).ToArray();
         }
@@ -84,7 +84,7 @@ public Task SavePropertiesAsync()
             return this.propertiesLazy.Value.SaveAsync();
         }
 
-        public Task<string> GetSharedAccessSignature(ISharedAccessPolicy policy)
+        public ValueTask<string> GetSharedAccessSignature(ISharedAccessPolicy policy)
         {
             var adHocPolicy = new SharedAccessBlobPolicy()
             {
@@ -93,7 +93,7 @@ public Task<string> GetSharedAccessSignature(ISharedAccessPolicy policy)
                 Permissions = AzureStore.FromGenericToAzure(policy.Permissions),
             };
 
-            return Task.FromResult(this.CloudBlob.GetSharedAccessSignature(adHocPolicy));
+            return new ValueTask<string>(this.CloudBlob.GetSharedAccessSignature(adHocPolicy));
         }
     }
 }
diff --git a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/Internal/ExtendedPropertiesProvider.cs b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/Internal/ExtendedPropertiesProvider.cs
index b5a639c..01e7a14 100644
--- a/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/Internal/ExtendedPropertiesProvider.cs
+++ b/src/GeekLearning.Storage.FileSystem.ExtendedProperties.FileSystem/Internal/ExtendedPropertiesProvider.cs
@@ -16,16 +16,16 @@ public ExtendedPropertiesProvider(
             this.options = options.Value;
         }
 
-        public Task<FileExtendedProperties> GetExtendedPropertiesAsync(string storeAbsolutePath, IPrivateFileReference file)
+        public ValueTask<FileExtendedProperties> GetExtendedPropertiesAsync(string storeAbsolutePath, IPrivateFileReference file)
         {
             var extendedPropertiesPath = this.GetExtendedPropertiesPath(storeAbsolutePath, file);
             if (!File.Exists(extendedPropertiesPath))
             {
-                return Task.FromResult(new FileExtendedProperties());
+                return new ValueTask<FileExtendedProperties>(new FileExtendedProperties());
             }
 
             var content = File.ReadAllText(extendedPropertiesPath);
-            return Task.FromResult(JsonConvert.DeserializeObject<FileExtendedProperties>(content));
+            return new ValueTask<FileExtendedProperties>(JsonConvert.DeserializeObject<FileExtendedProperties>(content));
         }
 
         public Task SaveExtendedPropertiesAsync(string storeAbsolutePath, IPrivateFileReference file, FileExtendedProperties extendedProperties)
diff --git a/src/GeekLearning.Storage.FileSystem/FileSystemStore.cs b/src/GeekLearning.Storage.FileSystem/FileSystemStore.cs
index dfa731b..13593fa 100644
--- a/src/GeekLearning.Storage.FileSystem/FileSystemStore.cs
+++ b/src/GeekLearning.Storage.FileSystem/FileSystemStore.cs
@@ -37,7 +37,7 @@ public Task InitAsync()
             return Task.FromResult(0);
         }
 
-        public async Task<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata)
+        public async ValueTask<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata)
         {
             var directoryPath = (string.IsNullOrEmpty(path) || path == "/" || path == "\\") ? this.AbsolutePath : Path.Combine(this.AbsolutePath, path);
 
@@ -57,7 +57,7 @@ public async Task<IFileReference[]> ListAsync(string path, bool recursive, bool
             return result.ToArray();
         }
 
-        public async Task<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata)
+        public async ValueTask<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata)
         {
             var directoryPath = (string.IsNullOrEmpty(path) || path == "/" || path == "\\") ? this.AbsolutePath : Path.Combine(this.AbsolutePath, path);
 
@@ -81,12 +81,12 @@ public async Task<IFileReference[]> ListAsync(string path, string searchPattern,
             return result.ToArray();
         }
 
-        public async Task<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata)
+        public async ValueTask<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata)
         {
             return await this.InternalGetAsync(file, withMetadata);
         }
 
-        public async Task<IFileReference> GetAsync(Uri uri, bool withMetadata)
+        public async ValueTask<IFileReference> GetAsync(Uri uri, bool withMetadata)
         {
             if (uri.IsAbsoluteUri)
             {
@@ -102,25 +102,25 @@ public async Task DeleteAsync(IPrivateFileReference file)
             await fileReference.DeleteAsync();
         }
 
-        public async Task<Stream> ReadAsync(IPrivateFileReference file)
+        public async ValueTask<Stream> ReadAsync(IPrivateFileReference file)
         {
             var fileReference = await this.InternalGetAsync(file);
             return await fileReference.ReadAsync();
         }
 
-        public async Task<byte[]> ReadAllBytesAsync(IPrivateFileReference file)
+        public async ValueTask<byte[]> ReadAllBytesAsync(IPrivateFileReference file)
         {
             var fileReference = await this.InternalGetAsync(file);
             return await fileReference.ReadAllBytesAsync();
         }
 
-        public async Task<string> ReadAllTextAsync(IPrivateFileReference file)
+        public async ValueTask<string> ReadAllTextAsync(IPrivateFileReference file)
         {
             var fileReference = await this.InternalGetAsync(file);
             return await fileReference.ReadAllTextAsync();
         }
 
-        public async Task<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType)
+        public async ValueTask<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType)
         {
             using (var stream = new MemoryStream(data, 0, data.Length))
             {
@@ -128,7 +128,7 @@ public async Task<IFileReference> SaveAsync(byte[] data, IPrivateFileReference f
             }
         }
 
-        public async Task<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType)
+        public async ValueTask<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType)
         {
             var fileReference = await this.InternalGetAsync(file, withMetadata: true, checkIfExists: false);
             this.EnsurePathExists(fileReference.FileSystemPath);
@@ -148,15 +148,14 @@ public async Task<IFileReference> SaveAsync(Stream data, IPrivateFileReference f
             return fileReference;
         }
 
-        public Task<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy)
+        public ValueTask<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy)
         {
             throw new NotSupportedException();
         }
 
-        private async Task<Internal.FileSystemFileReference> InternalGetAsync(IPrivateFileReference file, bool withMetadata = false, bool checkIfExists = true)
+        private async ValueTask<Internal.FileSystemFileReference> InternalGetAsync(IPrivateFileReference file, bool withMetadata = false, bool checkIfExists = true)
         {
-            var fileSystemFile = file as Internal.FileSystemFileReference;
-            if (fileSystemFile != null)
+            if (file is Internal.FileSystemFileReference fileSystemFile)
             {
                 return fileSystemFile;
             }
@@ -164,7 +163,7 @@ public Task<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy)
             return await this.InternalGetAsync(file.Path, withMetadata, checkIfExists);
         }
 
-        private async Task<Internal.FileSystemFileReference> InternalGetAsync(string path, bool withMetadata, bool checkIfExists = true)
+        private async ValueTask<Internal.FileSystemFileReference> InternalGetAsync(string path, bool withMetadata, bool checkIfExists = true)
         {
             var fullPath = Path.Combine(this.AbsolutePath, path);
             if (checkIfExists && !File.Exists(fullPath))
diff --git a/src/GeekLearning.Storage.FileSystem/IExtendedPropertiesProvider.cs b/src/GeekLearning.Storage.FileSystem/IExtendedPropertiesProvider.cs
index 843de53..5785103 100644
--- a/src/GeekLearning.Storage.FileSystem/IExtendedPropertiesProvider.cs
+++ b/src/GeekLearning.Storage.FileSystem/IExtendedPropertiesProvider.cs
@@ -4,7 +4,7 @@
 
     public interface IExtendedPropertiesProvider
     {
-        Task<Internal.FileExtendedProperties> GetExtendedPropertiesAsync(string storeAbsolutePath, IPrivateFileReference file);
+        ValueTask<Internal.FileExtendedProperties> GetExtendedPropertiesAsync(string storeAbsolutePath, IPrivateFileReference file);
 
         Task SaveExtendedPropertiesAsync(string storeAbsolutePath, IPrivateFileReference file, Internal.FileExtendedProperties extendedProperties);
     }
diff --git a/src/GeekLearning.Storage.FileSystem/Internal/FileSystemFileReference.cs b/src/GeekLearning.Storage.FileSystem/Internal/FileSystemFileReference.cs
index 71dab02..59102d6 100644
--- a/src/GeekLearning.Storage.FileSystem/Internal/FileSystemFileReference.cs
+++ b/src/GeekLearning.Storage.FileSystem/Internal/FileSystemFileReference.cs
@@ -60,20 +60,19 @@ public Task DeleteAsync()
             return Task.FromResult(true);
         }
 
-        public Task<byte[]> ReadAllBytesAsync()
+        public ValueTask<byte[]> ReadAllBytesAsync()
         {
-            return Task.FromResult(File.ReadAllBytes(this.FileSystemPath));
+            return new ValueTask<byte[]>(File.ReadAllBytes(this.FileSystemPath));
         }
 
-        public Task<string> ReadAllTextAsync()
+        public ValueTask<string> ReadAllTextAsync()
         {
-            return Task.FromResult(File.ReadAllText(this.FileSystemPath));
+            return new ValueTask<string>(File.ReadAllText(this.FileSystemPath));
         }
 
-        public Task<Stream> ReadAsync()
+        public ValueTask<Stream> ReadAsync()
         {
-            Stream stream = File.OpenRead(this.FileSystemPath);
-            return Task.FromResult(stream);
+            return new ValueTask<Stream>(File.OpenRead(this.FileSystemPath));
         }
 
         public async Task ReadToStreamAsync(Stream targetStream)
@@ -105,7 +104,7 @@ public Task SavePropertiesAsync()
                 (this.Properties as FileSystemFileProperties).ExtendedProperties);
         }
 
-        public Task<string> GetSharedAccessSignature(ISharedAccessPolicy policy)
+        public ValueTask<string> GetSharedAccessSignature(ISharedAccessPolicy policy)
         {
             throw new NotSupportedException();
         }
diff --git a/src/GeekLearning.Storage/GeekLearning.Storage.csproj b/src/GeekLearning.Storage/GeekLearning.Storage.csproj
index d796858..d8fcbc9 100644
--- a/src/GeekLearning.Storage/GeekLearning.Storage.csproj
+++ b/src/GeekLearning.Storage/GeekLearning.Storage.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/GeekLearning.Storage/IFileReference.cs b/src/GeekLearning.Storage/IFileReference.cs
index 2d344a0..d852349 100644
--- a/src/GeekLearning.Storage/IFileReference.cs
+++ b/src/GeekLearning.Storage/IFileReference.cs
@@ -11,11 +11,11 @@ public interface IFileReference : IPrivateFileReference
 
         Task ReadToStreamAsync(Stream targetStream);
 
-        Task<Stream> ReadAsync();
+        ValueTask<Stream> ReadAsync();
 
-        Task<string> ReadAllTextAsync();
+        ValueTask<string> ReadAllTextAsync();
 
-        Task<byte[]> ReadAllBytesAsync();
+        ValueTask<byte[]> ReadAllBytesAsync();
 
         Task DeleteAsync();
 
@@ -23,6 +23,6 @@ public interface IFileReference : IPrivateFileReference
 
         Task SavePropertiesAsync();
 
-        Task<string> GetSharedAccessSignature(ISharedAccessPolicy policy);
+        ValueTask<string> GetSharedAccessSignature(ISharedAccessPolicy policy);
     }
 }
diff --git a/src/GeekLearning.Storage/IStore.cs b/src/GeekLearning.Storage/IStore.cs
index 009147f..bf21425 100644
--- a/src/GeekLearning.Storage/IStore.cs
+++ b/src/GeekLearning.Storage/IStore.cs
@@ -10,26 +10,26 @@ public interface IStore
 
         Task InitAsync();
 
-        Task<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata);
+        ValueTask<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata);
 
-        Task<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata);
+        ValueTask<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata);
 
-        Task<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata);
+        ValueTask<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata);
 
-        Task<IFileReference> GetAsync(Uri file, bool withMetadata);
+        ValueTask<IFileReference> GetAsync(Uri file, bool withMetadata);
 
         Task DeleteAsync(IPrivateFileReference file);
 
-        Task<Stream> ReadAsync(IPrivateFileReference file);
+        ValueTask<Stream> ReadAsync(IPrivateFileReference file);
 
-        Task<byte[]> ReadAllBytesAsync(IPrivateFileReference file);
+        ValueTask<byte[]> ReadAllBytesAsync(IPrivateFileReference file);
 
-        Task<string> ReadAllTextAsync(IPrivateFileReference file);
+        ValueTask<string> ReadAllTextAsync(IPrivateFileReference file);
 
-        Task<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType);
+        ValueTask<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType);
 
-        Task<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType);
+        ValueTask<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType);
 
-        Task<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy);
+        ValueTask<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy);
     }
 }
diff --git a/src/GeekLearning.Storage/IStoreExtensions.cs b/src/GeekLearning.Storage/IStoreExtensions.cs
index e6880c2..30f789f 100644
--- a/src/GeekLearning.Storage/IStoreExtensions.cs
+++ b/src/GeekLearning.Storage/IStoreExtensions.cs
@@ -5,31 +5,31 @@
 
     public static class IStoreExtensions
     {
-        public static Task<IFileReference[]> ListAsync(this IStore store, string path, bool recursive = false, bool withMetadata = false)
+        public static ValueTask<IFileReference[]> ListAsync(this IStore store, string path, bool recursive = false, bool withMetadata = false)
             => store.ListAsync(path, recursive: recursive, withMetadata: withMetadata);
 
-        public static Task<IFileReference[]> ListAsync(this IStore store, string path, string searchPattern, bool recursive = false, bool withMetadata = false)
+        public static ValueTask<IFileReference[]> ListAsync(this IStore store, string path, string searchPattern, bool recursive = false, bool withMetadata = false)
             => store.ListAsync(path, searchPattern, recursive: recursive, withMetadata: withMetadata);
 
         public static Task DeleteAsync(this IStore store, string path)
             => store.DeleteAsync(new Internal.PrivateFileReference(path));
 
-        public static Task<IFileReference> GetAsync(this IStore store, string path, bool withMetadata = false)
+        public static ValueTask<IFileReference> GetAsync(this IStore store, string path, bool withMetadata = false)
             => store.GetAsync(new Internal.PrivateFileReference(path), withMetadata: withMetadata);
 
-        public static Task<Stream> ReadAsync(this IStore store, string path)
+        public static ValueTask<Stream> ReadAsync(this IStore store, string path)
             => store.ReadAsync(new Internal.PrivateFileReference(path));
 
-        public static Task<byte[]> ReadAllBytesAsync(this IStore store, string path)
+        public static ValueTask<byte[]> ReadAllBytesAsync(this IStore store, string path)
             => store.ReadAllBytesAsync(new Internal.PrivateFileReference(path));
 
-        public static Task<string> ReadAllTextAsync(this IStore store, string path)
+        public static ValueTask<string> ReadAllTextAsync(this IStore store, string path)
             => store.ReadAllTextAsync(new Internal.PrivateFileReference(path));
 
-        public static Task<IFileReference> SaveAsync(this IStore store, byte[] data, string path, string contentType)
+        public static ValueTask<IFileReference> SaveAsync(this IStore store, byte[] data, string path, string contentType)
             => store.SaveAsync(data, new Internal.PrivateFileReference(path), contentType);
 
-        public static Task<IFileReference> SaveAsync(this IStore store, Stream data, string path, string contentType)
+        public static ValueTask<IFileReference> SaveAsync(this IStore store, Stream data, string path, string contentType)
             => store.SaveAsync(data, new Internal.PrivateFileReference(path), contentType);
     }
 }
diff --git a/src/GeekLearning.Storage/Internal/GenericStoreProxy.cs b/src/GeekLearning.Storage/Internal/GenericStoreProxy.cs
index 6c85671..c8582c0 100644
--- a/src/GeekLearning.Storage/Internal/GenericStoreProxy.cs
+++ b/src/GeekLearning.Storage/Internal/GenericStoreProxy.cs
@@ -27,24 +27,24 @@ public GenericStoreProxy(IStorageFactory factory, IOptions<TOptions> options)
 
         public Task DeleteAsync(IPrivateFileReference file) => this.innerStore.DeleteAsync(file);
 
-        public Task<IFileReference> GetAsync(Uri file, bool withMetadata) => this.innerStore.GetAsync(file, withMetadata);
+        public ValueTask<IFileReference> GetAsync(Uri file, bool withMetadata) => this.innerStore.GetAsync(file, withMetadata);
 
-        public Task<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata) => this.innerStore.GetAsync(file, withMetadata);
+        public ValueTask<IFileReference> GetAsync(IPrivateFileReference file, bool withMetadata) => this.innerStore.GetAsync(file, withMetadata);
 
-        public Task<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata) => this.innerStore.ListAsync(path, recursive, withMetadata);
+        public ValueTask<IFileReference[]> ListAsync(string path, bool recursive, bool withMetadata) => this.innerStore.ListAsync(path, recursive, withMetadata);
 
-        public Task<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata) => this.innerStore.ListAsync(path, searchPattern, recursive, withMetadata);
+        public ValueTask<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive, bool withMetadata) => this.innerStore.ListAsync(path, searchPattern, recursive, withMetadata);
 
-        public Task<byte[]> ReadAllBytesAsync(IPrivateFileReference file) => this.innerStore.ReadAllBytesAsync(file);
+        public ValueTask<byte[]> ReadAllBytesAsync(IPrivateFileReference file) => this.innerStore.ReadAllBytesAsync(file);
 
-        public Task<string> ReadAllTextAsync(IPrivateFileReference file) => this.innerStore.ReadAllTextAsync(file);
+        public ValueTask<string> ReadAllTextAsync(IPrivateFileReference file) => this.innerStore.ReadAllTextAsync(file);
 
-        public Task<Stream> ReadAsync(IPrivateFileReference file) => this.innerStore.ReadAsync(file);
+        public ValueTask<Stream> ReadAsync(IPrivateFileReference file) => this.innerStore.ReadAsync(file);
 
-        public Task<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType) => this.innerStore.SaveAsync(data, file, contentType);
+        public ValueTask<IFileReference> SaveAsync(Stream data, IPrivateFileReference file, string contentType) => this.innerStore.SaveAsync(data, file, contentType);
 
-        public Task<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType) => this.innerStore.SaveAsync(data, file, contentType);
+        public ValueTask<IFileReference> SaveAsync(byte[] data, IPrivateFileReference file, string contentType) => this.innerStore.SaveAsync(data, file, contentType);
 
-        public Task<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy) => this.innerStore.GetSharedAccessSignatureAsync(policy);
+        public ValueTask<string> GetSharedAccessSignatureAsync(ISharedAccessPolicy policy) => this.innerStore.GetSharedAccessSignatureAsync(policy);
     }
 }