diff --git a/Core.Arango.Tests/LinqTest_BasicOperations.cs b/Core.Arango.Tests/LinqTest_BasicOperations.cs
index 46d68ebb63..8e96fa191c 100644
--- a/Core.Arango.Tests/LinqTest_BasicOperations.cs
+++ b/Core.Arango.Tests/LinqTest_BasicOperations.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Core.Arango.Protocol;
@@ -46,14 +44,9 @@ class InnerChain
         public string F { get; set; }
     }
 
-    public class LinqTest_BasicOperations : TestBase
+    public class LinqTest_BasicOperations(ITestOutputHelper output) : TestBase
     {
         private const string D = "test";
-        private readonly ITestOutputHelper _output;
-        public LinqTest_BasicOperations(ITestOutputHelper output)
-        {
-            _output = output;
-        }
 
         [Fact]
         public void Any()
@@ -81,7 +74,7 @@ public async Task GroupBy()
 
             var result = await q.ToListAsync();
 
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
         }
 
         /*[Fact]
@@ -192,7 +185,7 @@ public async Task Count_In_Filter()
             var q = Arango.Query<Activity>("test")
                 .Where(x => x.Notes.Count() == 3);
 
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
 
             var activities = await q.ToListAsync();
 
@@ -205,7 +198,7 @@ public async Task Count_In_Select()
             var q = Arango.Query<Activity>("test")
                 .Select(x => x.Notes.Count());
 
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
 
             var activitiesNotesCount = await q.ToListAsync();
 
@@ -227,7 +220,7 @@ public async Task Contains()
         {
             var p = await Arango.Query<Activity>("test").FirstOrDefaultAsync();
 
-            _output.WriteLine(JsonConvert.SerializeObject(p));
+            output.WriteLine(JsonConvert.SerializeObject(p));
 
             var boolean = Arango.Query<Activity>("test").Contains(p); // This should work: does `p` not get serialized the same way is it gets de-serialized? This operations should be inverse of each other.
 
@@ -283,7 +276,7 @@ public async Task Except_Compare_Keys()
                 .Select(x => x.Key)
                 .Except(list);
 
-            PrintQuery(q, _output);
+            PrintQuery(q, output);
 
             var p = await q.ToListAsync();
 
@@ -298,7 +291,7 @@ public async Task Combine_Skip_Take()
                 .Take(1)
                 .Select(x => x.Key);
 
-            PrintQuery(q, _output);
+            PrintQuery(q, output);
 
             var p = await q.ToListAsync();
 
@@ -357,8 +350,8 @@ public async Task Union()
 
             var aql = q.ToAql();
 
-            _output.WriteLine(aql.aql);
-            _output.WriteLine(JsonConvert.SerializeObject(aql.bindVars));
+            output.WriteLine(aql.aql);
+            output.WriteLine(JsonConvert.SerializeObject(aql.bindVars));
 
             var p = await q.ToListAsync();
 
diff --git a/Core.Arango.Tests/LinqTest_String.cs b/Core.Arango.Tests/LinqTest_String.cs
index a7726a3d22..bf2ebd3edc 100644
--- a/Core.Arango.Tests/LinqTest_String.cs
+++ b/Core.Arango.Tests/LinqTest_String.cs
@@ -1,26 +1,18 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Core.Arango.Protocol;
 using Core.Arango.Linq;
 using Core.Arango.Tests.Core;
-using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Core.Arango.Tests
 {
-    public class LinqTest_String : TestBase
+    public class LinqTest_String(ITestOutputHelper output) : TestBase
     {
         private const string D = "test";
-        private readonly ITestOutputHelper _output;
-        public LinqTest_String(ITestOutputHelper output)
-        {
-            _output = output;
-        }
 
         [Fact]
         public async Task StringConcat()
@@ -201,8 +193,8 @@ public async Task StringSubstring()
             Assert.Equal("Project A", p1.Name);
             Assert.Equal("Project A", p2.Name);
 
-            _output.WriteLine(q1.ToAql().aql);
-            _output.WriteLine(q2.ToAql().aql);
+            output.WriteLine(q1.ToAql().aql);
+            output.WriteLine(q2.ToAql().aql);
         }
 
         [Fact]
@@ -212,7 +204,7 @@ public async Task StringToLower()
             var p = await q.FirstOrDefaultAsync();
 
             Assert.Equal("Project A", p.Name);
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
         }
 
         [Fact]
@@ -222,7 +214,7 @@ public async Task StringToUpper()
             var p = await q.FirstOrDefaultAsync();
 
             Assert.Equal("Project A", p.Name);
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
         }
 
         public override async Task InitializeAsync()
diff --git a/Core.Arango.Tests/QueryStatisticTest.cs b/Core.Arango.Tests/QueryStatisticTest.cs
index 2ab326ba37..2a1c0f75bb 100644
--- a/Core.Arango.Tests/QueryStatisticTest.cs
+++ b/Core.Arango.Tests/QueryStatisticTest.cs
@@ -9,15 +9,8 @@
 
 namespace Core.Arango.Tests
 {
-    public class QueryStatisticTest : TestBase
+    public class QueryStatisticTest(ITestOutputHelper output) : TestBase
     {
-        private readonly ITestOutputHelper _output;
-
-        public QueryStatisticTest(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         public override async Task InitializeAsync()
         {
             Arango =
@@ -31,7 +24,7 @@ public override async Task InitializeAsync()
                             foreach (var p in bindVars.OrderByDescending(x => x.Key.Length))
                                 boundQuery = boundQuery.Replace("@" + p.Key, JsonConvert.SerializeObject(p.Value));
 
-                            _output.WriteLine(
+                            output.WriteLine(
                                 $"{boundQuery}\n{JsonConvert.SerializeObject(stats, Formatting.Indented)}");
                         }
                     });
diff --git a/Core.Arango.Tests/TransactionTest.cs b/Core.Arango.Tests/TransactionTest.cs
index 470fd6fb32..f1523cf2b3 100644
--- a/Core.Arango.Tests/TransactionTest.cs
+++ b/Core.Arango.Tests/TransactionTest.cs
@@ -110,7 +110,7 @@ public async Task StreamTransactionQuery(string serializer)
             Assert.Equal(3, (await Arango.Query.FindAsync<Entity>("test", "test", $"true")).Count);
 
             var exception =
-                await Assert.ThrowsAsync<ArangoException>(() => Arango.Query.FindAsync<Entity>(t2, "test", $"true"));
+                await Assert.ThrowsAsync<ArangoException>(() => Arango.Query.FindAsync<Entity>(t2, "test", $"true").AsTask());
 
             Assert.NotNull(exception.ErrorNumber);
             Assert.NotNull(exception.Code);
diff --git a/Core.Arango/ArangoContext.cs b/Core.Arango/ArangoContext.cs
index 76d7a54b0c..78345428d9 100644
--- a/Core.Arango/ArangoContext.cs
+++ b/Core.Arango/ArangoContext.cs
@@ -110,7 +110,7 @@ public ArangoContext(string cs, IArangoConfiguration settings = null)
         public IArangoPregelModule Pregel { get; }
 
         /// <inheritdoc />
-        public async Task<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default)
         {
             var res = await Configuration.Transport.SendAsync<ArangoVersion>(HttpMethod.Get,
                 "/_db/_system/_api/version",
@@ -123,7 +123,7 @@ public async Task<ArangoVersion> GetVersionAsync(CancellationToken cancellationT
         }
 
         /// <inheritdoc />
-        public async Task<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default)
         {
             var res = await Configuration.Transport.SendAsync<EndpointResponse>(HttpMethod.Get,
                 "/_api/cluster/endpoints", cancellationToken: cancellationToken);
diff --git a/Core.Arango/IArangoContext.cs b/Core.Arango/IArangoContext.cs
index 9104fb1eba..6f79f91ef6 100644
--- a/Core.Arango/IArangoContext.cs
+++ b/Core.Arango/IArangoContext.cs
@@ -90,11 +90,11 @@ public interface IArangoContext
         /// <summary>
         ///     Get Arango server version and license
         /// </summary>
-        Task<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default);
+        ValueTask<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Get Arango cluster endpoints
         /// </summary>
-        Task<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default);
+        ValueTask<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Linq/ArangoQueryExtensions.cs b/Core.Arango/Linq/ArangoQueryExtensions.cs
index 8a6f819955..f893417d11 100644
--- a/Core.Arango/Linq/ArangoQueryExtensions.cs
+++ b/Core.Arango/Linq/ArangoQueryExtensions.cs
@@ -51,29 +51,29 @@ public static (string aql, IDictionary<string, object> bindVars) ToAql<T>(this I
             return (data.Query.Trim(), data.BindVars);
         }
 
-        public static Task<TSource> FirstAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> FirstAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, false, null, cancellationToken);
         }
 
-        public static Task<TSource> FirstAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> FirstAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, false, predicate, cancellationToken);
         }
 
-        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, true, null, cancellationToken);
         }
 
-        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, true, predicate, cancellationToken);
         }
 
-        private static Task<T> FirstOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
+        private static ValueTask<T> FirstOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
             Expression<Func<T, bool>> predicate, CancellationToken cancellationToken = default)
         {
             if (predicate != null)
@@ -85,29 +85,29 @@ private static Task<T> FirstOrDefaultAsync<T>(this IQueryable<T> source, bool re
                 : source.AsArangoQueryable().FirstAsync(cancellationToken);
         }
 
-        public static Task<TSource> SingleAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> SingleAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, false, null, cancellationToken);
         }
 
-        public static Task<TSource> SingleAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> SingleAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, false, predicate, cancellationToken);
         }
 
-        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, true, null, cancellationToken);
         }
 
-        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, true, predicate, cancellationToken);
         }
 
-        private static Task<T> SingleOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
+        private static ValueTask<T> SingleOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
             Expression<Func<T, bool>> predicate, CancellationToken cancellationToken = default)
         {
             if (predicate != null)
@@ -119,7 +119,7 @@ private static Task<T> SingleOrDefaultAsync<T>(this IQueryable<T> source, bool r
                 : source.AsArangoQueryable().SingleAsync(cancellationToken);
         }
 
-        public static Task<List<T>> ToListAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken = default)
+        public static ValueTask<List<T>> ToListAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken = default)
         {
             return source.AsArangoQueryable().ToListAsync(cancellationToken);
         }
diff --git a/Core.Arango/Linq/Interface/IArangoLinq.cs b/Core.Arango/Linq/Interface/IArangoLinq.cs
index da627cf38f..a0cffa9f12 100644
--- a/Core.Arango/Linq/Interface/IArangoLinq.cs
+++ b/Core.Arango/Linq/Interface/IArangoLinq.cs
@@ -11,6 +11,6 @@ internal interface IArangoLinq
         public string ResolvePropertyName(Type t, string s);
         public string ResolveCollectionName(Type t);
         public IAsyncEnumerable<T> StreamAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default);
-        public Task<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default);
+        public ValueTask<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Linq/Internal/ArangoLinq.cs b/Core.Arango/Linq/Internal/ArangoLinq.cs
index 9c27340ba7..4e0855a3b8 100644
--- a/Core.Arango/Linq/Internal/ArangoLinq.cs
+++ b/Core.Arango/Linq/Internal/ArangoLinq.cs
@@ -34,7 +34,7 @@ public IAsyncEnumerable<T> StreamAsync<T>(string query, IDictionary<string, obje
             return _context.Query.ExecuteStreamAsync<T>(_handle, query, bindVars, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default)
+        public async ValueTask<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default)
         {
             return await _context.Query.ExecuteAsync<T>(_handle, query, bindVars, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
diff --git a/Core.Arango/Linq/Query/ArangoQueryable.cs b/Core.Arango/Linq/Query/ArangoQueryable.cs
index acd9ac61ff..2171ef46a4 100644
--- a/Core.Arango/Linq/Query/ArangoQueryable.cs
+++ b/Core.Arango/Linq/Query/ArangoQueryable.cs
@@ -29,34 +29,34 @@ public ArangoQueryable(IQueryProvider provider, Expression expression, IArangoLi
             this.db = db;
         }
 
-        public async Task<List<T>> ToListAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<List<T>> ToListAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             return await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<T> SingleOrDefaultAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> SingleOrDefaultAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
             return list.SingleOrDefault();
         }
 
-        public async Task<T> SingleAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> SingleAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
             return list.Single();
         }
 
-        public async Task<T> FirstOrDefaultAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> FirstOrDefaultAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
             return list.FirstOrDefault();
         }
 
-        public async Task<T> FirstAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> FirstAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
diff --git a/Core.Arango/Modules/IArangoAnalyzerModule.cs b/Core.Arango/Modules/IArangoAnalyzerModule.cs
index 29d7249da0..1d0a35d922 100644
--- a/Core.Arango/Modules/IArangoAnalyzerModule.cs
+++ b/Core.Arango/Modules/IArangoAnalyzerModule.cs
@@ -13,7 +13,7 @@ public interface IArangoAnalyzerModule
         /// <summary>
         ///     creates a new Analyzer based on the provided definition
         /// </summary>
-        Task CreateAsync(ArangoHandle database, ArangoAnalyzer analyzer, CancellationToken cancellationToken = default);
+        ValueTask CreateAsync(ArangoHandle database, ArangoAnalyzer analyzer, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     removes an Analyzer configuration
@@ -22,19 +22,19 @@ public interface IArangoAnalyzerModule
         /// <param name="analyzer">The name of the Analyzer to remove.</param>
         /// <param name="force">The Analyzer configuration should be removed even if it is in-use. The default value is false.</param>
         /// <param name="cancellationToken"></param>
-        Task DeleteAsync(ArangoHandle database, string analyzer, bool force = false,
+        ValueTask DeleteAsync(ArangoHandle database, string analyzer, bool force = false,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     returns a listing of available Analyzer definitions
         /// </summary>
-        Task<IReadOnlyCollection<ArangoAnalyzer>> ListAsync(ArangoHandle database,
+        ValueTask<IReadOnlyCollection<ArangoAnalyzer>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     returns an Analyzer definition
         /// </summary>
-        Task<ArangoAnalyzer> GetDefinitionAsync(ArangoHandle database, string analyzer,
+        ValueTask<ArangoAnalyzer> GetDefinitionAsync(ArangoHandle database, string analyzer,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoBackupModule.cs b/Core.Arango/Modules/IArangoBackupModule.cs
index 6a96e20868..9f0225fc07 100644
--- a/Core.Arango/Modules/IArangoBackupModule.cs
+++ b/Core.Arango/Modules/IArangoBackupModule.cs
@@ -13,21 +13,21 @@ public interface IArangoBackupModule
         /// <summary>
         ///     Creates a local backup.
         /// </summary>
-        Task<ArangoBackup> CreateAsync(ArangoBackupRequest request, CancellationToken cancellationToken = default);
+        ValueTask<ArangoBackup> CreateAsync(ArangoBackupRequest request, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Restores from a local backup.
         /// </summary>
-        Task RestoreAsync(string id, CancellationToken cancellationToken = default);
+        ValueTask RestoreAsync(string id, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Delete a specific local backup.
         /// </summary>
-        Task DeleteAsync(string id, CancellationToken cancellationToken = default);
+        ValueTask DeleteAsync(string id, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     List all local backups.
         /// </summary>
-        Task<List<ArangoBackup>> ListAsync(string id = null, CancellationToken cancellationToken = default);
+        ValueTask<List<ArangoBackup>> ListAsync(string id = null, CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoCollectionModule.cs b/Core.Arango/Modules/IArangoCollectionModule.cs
index 9f33ae4423..e3c16dd4ed 100644
--- a/Core.Arango/Modules/IArangoCollectionModule.cs
+++ b/Core.Arango/Modules/IArangoCollectionModule.cs
@@ -13,67 +13,67 @@ public interface IArangoCollectionModule
         /// <summary>
         ///     Creates a collection
         /// </summary>
-        Task CreateAsync(ArangoHandle database, ArangoCollection collection,
+        ValueTask CreateAsync(ArangoHandle database, ArangoCollection collection,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Creates a collection
         /// </summary>
-        Task CreateAsync(ArangoHandle database, string collection, ArangoCollectionType type,
+        ValueTask CreateAsync(ArangoHandle database, string collection, ArangoCollectionType type,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Returns all collections
         /// </summary>
-        Task<IReadOnlyCollection<ArangoCollection>> ListAsync(ArangoHandle database,
+        ValueTask<IReadOnlyCollection<ArangoCollection>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Renames a collection (not in cluster)
         /// </summary>
-        Task RenameAsync(ArangoHandle database, string oldname, string newname,
+        ValueTask RenameAsync(ArangoHandle database, string oldname, string newname,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Truncates a collection
         /// </summary>
-        Task TruncateAsync(ArangoHandle database, string collection, CancellationToken cancellationToken = default);
+        ValueTask TruncateAsync(ArangoHandle database, string collection, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Changes a collection
         /// </summary>
-        Task UpdateAsync(ArangoHandle database, string collection, ArangoCollectionUpdate update,
+        ValueTask UpdateAsync(ArangoHandle database, string collection, ArangoCollectionUpdate update,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Drops a collection
         /// </summary>
         /// <returns></returns>
-        Task DropAsync(ArangoHandle database, string collection,
+        ValueTask DropAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Returns a collection
         /// </summary>
-        Task<ArangoCollection> GetAsync(ArangoHandle database, string collection,
+        ValueTask<ArangoCollection> GetAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Checks of collection exists (calls ListAsync internally)
         /// </summary>
-        Task<bool> ExistAsync(ArangoHandle database, string collection,
+        ValueTask<bool> ExistAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Compacts the data of a collection in order to reclaim disk space
         /// </summary>
-        Task CompactAsync(ArangoHandle database, string collection,
+        ValueTask CompactAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Recalculates the document count of a collection, if it ever becomes inconsistent.
         /// </summary>
-        Task RecalculateCountAsync(ArangoHandle database, string collection,
+        ValueTask RecalculateCountAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoDatabaseModule.cs b/Core.Arango/Modules/IArangoDatabaseModule.cs
index 1f69a3de06..209ede9621 100644
--- a/Core.Arango/Modules/IArangoDatabaseModule.cs
+++ b/Core.Arango/Modules/IArangoDatabaseModule.cs
@@ -13,31 +13,31 @@ public interface IArangoDatabaseModule
         /// <summary>
         ///     Creates a new database
         /// </summary>
-        Task<bool> CreateAsync(ArangoHandle name, CancellationToken cancellationToken = default);
+        ValueTask<bool> CreateAsync(ArangoHandle name, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Creates a new database with options
         /// </summary>
-        Task<bool> CreateAsync(ArangoDatabase database, CancellationToken cancellationToken = default);
+        ValueTask<bool> CreateAsync(ArangoDatabase database, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Retrieves information about the current database
         /// </summary>
-        Task<ArangoDatabaseInfo> GetAsync(ArangoHandle handle, CancellationToken cancellationToken = default);
+        ValueTask<ArangoDatabaseInfo> GetAsync(ArangoHandle handle, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Drop an existing database
         /// </summary>
-        Task DropAsync(ArangoHandle name, CancellationToken cancellationToken = default);
+        ValueTask DropAsync(ArangoHandle name, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Checks if database exists
         /// </summary>
-        Task<bool> ExistAsync(ArangoHandle name, CancellationToken cancellationToken = default);
+        ValueTask<bool> ExistAsync(ArangoHandle name, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Retrieves a list of all existing databases
         /// </summary>
-        Task<List<string>> ListAsync(CancellationToken cancellationToken = default);
+        ValueTask<List<string>> ListAsync(CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoDocumentModule.cs b/Core.Arango/Modules/IArangoDocumentModule.cs
index 142f2a955d..409fe3d4f6 100644
--- a/Core.Arango/Modules/IArangoDocumentModule.cs
+++ b/Core.Arango/Modules/IArangoDocumentModule.cs
@@ -26,7 +26,7 @@ public interface IArangoDocumentModule
         ///     HTTP 304 is returned.
         /// </param>
         /// <param name="cancellationToken"></param>
-        Task<T> GetAsync<T>(ArangoHandle handle,
+        ValueTask<T> GetAsync<T>(ArangoHandle handle,
             string collection,
             string key,
             bool throwOnError = true,
@@ -45,7 +45,7 @@ Task<T> GetAsync<T>(ArangoHandle handle,
         ///     if it has the same revision value
         /// </param>
         /// <param name="cancellationToken"></param>
-        Task<List<T>> GetManyAsync<T>(ArangoHandle handle,
+        ValueTask<List<T>> GetManyAsync<T>(ArangoHandle handle,
             string collection,
             IEnumerable<object> keys,
             bool? ignoreRevs = null,
@@ -54,7 +54,7 @@ Task<List<T>> GetManyAsync<T>(ArangoHandle handle,
         /// <summary>
         ///     Creates multiple documents
         /// </summary>
-        Task<List<ArangoUpdateResult<TR>>> CreateManyAsync<T, TR>(ArangoHandle database,
+        ValueTask<List<ArangoUpdateResult<TR>>> CreateManyAsync<T, TR>(ArangoHandle database,
             string collection,
             IEnumerable<T> docs,
             bool? waitForSync = null,
@@ -70,7 +70,7 @@ Task<List<ArangoUpdateResult<TR>>> CreateManyAsync<T, TR>(ArangoHandle database,
         /// <summary>
         ///     Creates multiple documents
         /// </summary>
-        Task<List<ArangoUpdateResult<ArangoVoid>>> CreateManyAsync<T>(ArangoHandle database,
+        ValueTask<List<ArangoUpdateResult<ArangoVoid>>> CreateManyAsync<T>(ArangoHandle database,
             string collection,
             IEnumerable<T> docs,
             bool? waitForSync = null,
@@ -86,7 +86,7 @@ Task<List<ArangoUpdateResult<ArangoVoid>>> CreateManyAsync<T>(ArangoHandle datab
         /// <summary>
         ///     Create document
         /// </summary>
-        Task<ArangoUpdateResult<TR>> CreateAsync<T, TR>(ArangoHandle database,
+        ValueTask<ArangoUpdateResult<TR>> CreateAsync<T, TR>(ArangoHandle database,
             string collection, T doc,
             bool? waitForSync = null,
             bool? keepNull = null,
@@ -101,7 +101,7 @@ Task<ArangoUpdateResult<TR>> CreateAsync<T, TR>(ArangoHandle database,
         /// <summary>
         ///     Create document
         /// </summary>
-        Task<ArangoUpdateResult<ArangoVoid>> CreateAsync<T>(ArangoHandle database,
+        ValueTask<ArangoUpdateResult<ArangoVoid>> CreateAsync<T>(ArangoHandle database,
             string collection, T doc,
             bool? waitForSync = null,
             bool? keepNull = null,
@@ -116,14 +116,14 @@ Task<ArangoUpdateResult<ArangoVoid>> CreateAsync<T>(ArangoHandle database,
         /// <summary>
         ///     Removes multiple documents
         /// </summary>
-        Task<List<ArangoUpdateResult<TR>>> DeleteManyAsync<T, TR>(ArangoHandle database, string collection,
+        ValueTask<List<ArangoUpdateResult<TR>>> DeleteManyAsync<T, TR>(ArangoHandle database, string collection,
             IEnumerable<T> docs, bool? waitForSync = null, bool? returnOld = null, bool? ignoreRevs = null, bool? exclusive = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Removes single document by key
         /// </summary>
-        Task<ArangoUpdateResult<TR>> DeleteAsync<TR>(ArangoHandle database, string collection, string key,
+        ValueTask<ArangoUpdateResult<TR>> DeleteAsync<TR>(ArangoHandle database, string collection, string key,
             bool? waitForSync = null, bool? returnOld = null, bool? silent = null, bool? exclusive = null,
             string ifMatch = null, CancellationToken cancellationToken = default);
 
@@ -137,13 +137,13 @@ IAsyncEnumerable<List<T>> ExportAsync<T>(ArangoHandle database, string collectio
         /// <summary>
         ///     Bulk import
         /// </summary>
-        Task ImportAsync<T>(ArangoHandle database, string collection, IEnumerable<T> docs, bool complete = true,
+        ValueTask ImportAsync<T>(ArangoHandle database, string collection, IEnumerable<T> docs, bool complete = true,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Replaces multiple documents
         /// </summary>
-        Task<List<ArangoUpdateResult<TR>>> ReplaceManyAsync<T, TR>(ArangoHandle database, string collection,
+        ValueTask<List<ArangoUpdateResult<TR>>> ReplaceManyAsync<T, TR>(ArangoHandle database, string collection,
             IEnumerable<T> docs, bool? waitForSync = null, bool? returnOld = null, bool? returnNew = null,
             bool? ignoreRevs = null, bool? exclusive = null,
             CancellationToken cancellationToken = default);
@@ -151,7 +151,7 @@ Task<List<ArangoUpdateResult<TR>>> ReplaceManyAsync<T, TR>(ArangoHandle database
         /// <summary>
         ///     Replaces multiple documents
         /// </summary>
-        Task<List<ArangoUpdateResult<ArangoVoid>>> ReplaceManyAsync<T>(ArangoHandle database, string collection,
+        ValueTask<List<ArangoUpdateResult<ArangoVoid>>> ReplaceManyAsync<T>(ArangoHandle database, string collection,
             IEnumerable<T> docs, bool? waitForSync = null, bool? returnOld = null, bool? returnNew = null,
             bool? ignoreRevs = null, bool? exclusive = null,
             CancellationToken cancellationToken = default);
@@ -159,21 +159,21 @@ Task<List<ArangoUpdateResult<ArangoVoid>>> ReplaceManyAsync<T>(ArangoHandle data
         /// <summary>
         ///     Replace single document
         /// </summary>
-        Task<ArangoUpdateResult<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string collection, T doc,
+        ValueTask<ArangoUpdateResult<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string collection, T doc,
             bool waitForSync = false, bool? returnOld = null, bool? returnNew = null, bool? ignoreRevs = null,
             bool? exclusive = null, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Replace single document
         /// </summary>
-        Task<ArangoUpdateResult<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string collection, T doc,
+        ValueTask<ArangoUpdateResult<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string collection, T doc,
             bool waitForSync = false, bool? returnOld = null, bool? returnNew = null, bool? ignoreRevs = null,
             bool? exclusive = null, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Updates multiple documents
         /// </summary>
-        Task<List<ArangoUpdateResult<ArangoVoid>>> UpdateManyAsync<T>(ArangoHandle database, string collection,
+        ValueTask<List<ArangoUpdateResult<ArangoVoid>>> UpdateManyAsync<T>(ArangoHandle database, string collection,
             IEnumerable<T> docs, bool? waitForSync = null, bool? keepNull = null, bool? mergeObjects = null,
             bool? returnOld = null, bool? returnNew = null, bool? silent = null, bool? ignoreRevs = null,
             bool? exclusive = null, CancellationToken cancellationToken = default);
@@ -181,7 +181,7 @@ Task<List<ArangoUpdateResult<ArangoVoid>>> UpdateManyAsync<T>(ArangoHandle datab
         /// <summary>
         ///     Updates multiple documents
         /// </summary>
-        Task<List<ArangoUpdateResult<TR>>> UpdateManyAsync<T, TR>(ArangoHandle database, string collection,
+        ValueTask<List<ArangoUpdateResult<TR>>> UpdateManyAsync<T, TR>(ArangoHandle database, string collection,
             IEnumerable<T> docs, bool? waitForSync = null, bool? keepNull = null, bool? mergeObjects = null,
             bool? returnOld = null, bool? returnNew = null, bool? silent = null, bool? ignoreRevs = null,
             bool? exclusive = null, CancellationToken cancellationToken = default);
@@ -189,7 +189,7 @@ Task<List<ArangoUpdateResult<TR>>> UpdateManyAsync<T, TR>(ArangoHandle database,
         /// <summary>
         ///     Updates single document
         /// </summary>
-        Task<ArangoUpdateResult<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string collection, T doc,
+        ValueTask<ArangoUpdateResult<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string collection, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? mergeObjects = null, bool? returnOld = null,
             bool? returnNew = null, bool? silent = null, bool? ignoreRevs = null, bool? exclusive = null,
             CancellationToken cancellationToken = default);
@@ -197,7 +197,7 @@ Task<ArangoUpdateResult<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, strin
         /// <summary>
         ///     Updates single document
         /// </summary>
-        Task<ArangoUpdateResult<TR>> UpdateAsync<T, TR>(ArangoHandle database, string collection, T doc,
+        ValueTask<ArangoUpdateResult<TR>> UpdateAsync<T, TR>(ArangoHandle database, string collection, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? mergeObjects = null, bool? returnOld = null,
             bool? returnNew = null, bool? silent = null, bool? ignoreRevs = null, bool? exclusive = null,
             CancellationToken cancellationToken = default);
diff --git a/Core.Arango/Modules/IArangoFoxxModule.cs b/Core.Arango/Modules/IArangoFoxxModule.cs
index 50578cc02b..a47a4f88c4 100644
--- a/Core.Arango/Modules/IArangoFoxxModule.cs
+++ b/Core.Arango/Modules/IArangoFoxxModule.cs
@@ -18,7 +18,7 @@ public interface IArangoFoxxModule
         /// <param name="excludeSystem">Whether or not system services should be excluded from the result.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<ICollection<ArangoFoxxService>> ListServicesAsync(ArangoHandle database, bool? excludeSystem = null,
+        ValueTask<ICollection<ArangoFoxxService>> ListServicesAsync(ArangoHandle database, bool? excludeSystem = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -32,7 +32,7 @@ Task<ICollection<ArangoFoxxService>> ListServicesAsync(ArangoHandle database, bo
         /// <param name="legacy">Set to true to install the service in 2.8 legacy compatibility mode.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<ArangoVoid> InstallServiceAsync(ArangoHandle database, string mount, ArangoFoxxSource service,
+        ValueTask<ArangoVoid> InstallServiceAsync(ArangoHandle database, string mount, ArangoFoxxSource service,
             bool? development = null, bool? setup = null, bool? legacy = null,
             CancellationToken cancellationToken = default);
 
@@ -48,7 +48,7 @@ Task<ArangoVoid> InstallServiceAsync(ArangoHandle database, string mount, Arango
         /// <param name="force">Set to true to force service install even if no service is installed under given mount.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<ArangoVoid> ReplaceServiceAsync(ArangoHandle database, string mount, ArangoFoxxSource service,
+        ValueTask<ArangoVoid> ReplaceServiceAsync(ArangoHandle database, string mount, ArangoFoxxSource service,
             bool? teardown = null, bool? setup = null, bool? legacy = null, bool? force = null,
             CancellationToken cancellationToken = default);
 
@@ -64,89 +64,89 @@ Task<ArangoVoid> ReplaceServiceAsync(ArangoHandle database, string mount, Arango
         /// <param name="force">Set to true to force service install even if no service is installed under given mount.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<ArangoVoid> UpgradeServiceAsync(ArangoHandle database, string mount, ArangoFoxxSource service,
+        ValueTask<ArangoVoid> UpgradeServiceAsync(ArangoHandle database, string mount, ArangoFoxxSource service,
             bool? teardown = null, bool? setup = null, bool? legacy = null, bool? force = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Uninstall service
         /// </summary>
-        Task<ArangoVoid> UninstallServiceAsync(ArangoHandle database, string mount,
+        ValueTask<ArangoVoid> UninstallServiceAsync(ArangoHandle database, string mount,
             bool? teardown = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Get configuration options
         /// </summary>
-        Task<T> GetConfigurationAsync<T>(ArangoHandle database, string mount,
+        ValueTask<T> GetConfigurationAsync<T>(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Update configuration options
         /// </summary>
-        Task<ArangoVoid> UpdateConfigurationAsync(ArangoHandle database, string mount,
+        ValueTask<ArangoVoid> UpdateConfigurationAsync(ArangoHandle database, string mount,
             object configuration = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Replace configuration options
         /// </summary>
-        Task<ArangoVoid> ReplaceConfigurationAsync(ArangoHandle database, string mount,
+        ValueTask<ArangoVoid> ReplaceConfigurationAsync(ArangoHandle database, string mount,
             object configuration = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Get dependency options
         /// </summary>
-        Task<T> GetDependenciesAsync<T>(ArangoHandle database, string mount,
+        ValueTask<T> GetDependenciesAsync<T>(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Update dependency options
         /// </summary>
-        Task<ArangoVoid> UpdateDependenciesAsync(ArangoHandle database, string mount,
+        ValueTask<ArangoVoid> UpdateDependenciesAsync(ArangoHandle database, string mount,
             object dependencies = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Replace dependency options
         /// </summary>
-        Task<ArangoVoid> ReplaceDependenciesAsync(ArangoHandle database, string mount,
+        ValueTask<ArangoVoid> ReplaceDependenciesAsync(ArangoHandle database, string mount,
             object dependencies = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     HTTP GET request to Foxx service
         /// </summary>
-        Task<T> GetAsync<T>(ArangoHandle database, string path,
+        ValueTask<T> GetAsync<T>(ArangoHandle database, string path,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     HTTP POST request to Foxx service
         /// </summary>
-        Task<T> PostAsync<T>(ArangoHandle database, string path, object body,
+        ValueTask<T> PostAsync<T>(ArangoHandle database, string path, object body,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     HTTP PUT request to Foxx service
         /// </summary>
-        Task<T> PutAsync<T>(ArangoHandle database, string path, object body,
+        ValueTask<T> PutAsync<T>(ArangoHandle database, string path, object body,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     HTTP PATCH request to Foxx service
         /// </summary>
-        Task<T> PatchAsync<T>(ArangoHandle database, string path, object body,
+        ValueTask<T> PatchAsync<T>(ArangoHandle database, string path, object body,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     HTTP DELETE request to Foxx service
         /// </summary>
-        Task<T> DeleteAsync<T>(ArangoHandle database, string path,
+        ValueTask<T> DeleteAsync<T>(ArangoHandle database, string path,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default);
 
@@ -157,7 +157,7 @@ Task<T> DeleteAsync<T>(ArangoHandle database, string path,
         /// <param name="mount">Mount path of the installed service.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task EnableDevelopmentModeAsync(ArangoHandle database, string mount,
+        ValueTask EnableDevelopmentModeAsync(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -167,7 +167,7 @@ Task EnableDevelopmentModeAsync(ArangoHandle database, string mount,
         /// <param name="mount">Mount path of the installed service.</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task DisableDevelopmentModeAsync(ArangoHandle database, string mount,
+        ValueTask DisableDevelopmentModeAsync(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -177,7 +177,7 @@ Task DisableDevelopmentModeAsync(ArangoHandle database, string mount,
         /// <param name="mount"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<Stream> DownloadServiceAsync<T>(ArangoHandle database, string mount,
+        ValueTask<Stream> DownloadServiceAsync<T>(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -189,7 +189,7 @@ Task<Stream> DownloadServiceAsync<T>(ArangoHandle database, string mount,
         /// <param name="body"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<T> RunServiceScriptAsync<T>(ArangoHandle database, string mount, string name,
+        ValueTask<T> RunServiceScriptAsync<T>(ArangoHandle database, string mount, string name,
             object body = null,
             CancellationToken cancellationToken = default);
     }
diff --git a/Core.Arango/Modules/IArangoFunctionModule.cs b/Core.Arango/Modules/IArangoFunctionModule.cs
index a3a0e3c055..d89c3bc170 100644
--- a/Core.Arango/Modules/IArangoFunctionModule.cs
+++ b/Core.Arango/Modules/IArangoFunctionModule.cs
@@ -14,7 +14,7 @@ public interface IArangoFunctionModule
         ///     create a new AQL user function
         /// </summary>
         /// <returns>true if newly created</returns>
-        Task<bool> CreateAsync(ArangoHandle database, ArangoFunctionDefinition request,
+        ValueTask<bool> CreateAsync(ArangoHandle database, ArangoFunctionDefinition request,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -28,7 +28,7 @@ Task<bool> CreateAsync(ArangoHandle database, ArangoFunctionDefinition request,
         /// </param>
         /// <param name="cancellationToken"></param>
         /// <returns>number of deleted functions</returns>
-        Task<int> RemoveAsync(ArangoHandle database, string name, bool? group = false,
+        ValueTask<int> RemoveAsync(ArangoHandle database, string name, bool? group = false,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -38,7 +38,7 @@ Task<int> RemoveAsync(ArangoHandle database, string name, bool? group = false,
         /// <param name="ns">filter user functions from namespace</param>
         /// <param name="cancellationToken"></param>
         /// <returns>list of function definitions</returns>
-        Task<IReadOnlyCollection<ArangoFunctionDefinition>> ListAsync(ArangoHandle database, string ns = null,
+        ValueTask<IReadOnlyCollection<ArangoFunctionDefinition>> ListAsync(ArangoHandle database, string ns = null,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoGraphEdgeModule.cs b/Core.Arango/Modules/IArangoGraphEdgeModule.cs
index aa7386d005..a95ad42975 100644
--- a/Core.Arango/Modules/IArangoGraphEdgeModule.cs
+++ b/Core.Arango/Modules/IArangoGraphEdgeModule.cs
@@ -12,13 +12,13 @@ public interface IArangoGraphEdgeModule
         /// <summary>
         ///     Fetch an edge
         /// </summary>
-        Task<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
+        ValueTask<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Creates an edge in an existing graph
         /// </summary>
-        Task<ArangoEdgeResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoEdgeResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph, string collection,
             T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default);
@@ -26,7 +26,7 @@ Task<ArangoEdgeResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, strin
         /// <summary>
         ///     Modify an existing edge
         /// </summary>
-        Task<ArangoEdgeResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoEdgeResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -34,7 +34,7 @@ Task<ArangoEdgeResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, strin
         /// <summary>
         ///     Replace the content of an existing edge
         /// </summary>
-        Task<ArangoEdgeResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoEdgeResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -42,7 +42,7 @@ Task<ArangoEdgeResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, stri
         /// <summary>
         ///     Removes an edge from graph
         /// </summary>
-        Task<ArangoEdgeResponse<ArangoVoid>> RemoveAsync<T>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoEdgeResponse<ArangoVoid>> RemoveAsync<T>(ArangoHandle database, string graph, string collection,
             string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -50,14 +50,14 @@ Task<ArangoEdgeResponse<ArangoVoid>> RemoveAsync<T>(ArangoHandle database, strin
         /// <summary>
         ///     Creates an edge in an existing graph
         /// </summary>
-        Task<ArangoEdgeResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph, string collection, T doc,
+        ValueTask<ArangoEdgeResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph, string collection, T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Modify an existing edge
         /// </summary>
-        Task<ArangoEdgeResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoEdgeResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -65,7 +65,7 @@ Task<ArangoEdgeResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string gr
         /// <summary>
         ///     Replace the content of an existing edge
         /// </summary>
-        Task<ArangoEdgeResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoEdgeResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -73,7 +73,7 @@ Task<ArangoEdgeResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string g
         /// <summary>
         ///     Removes an edge from graph
         /// </summary>
-        Task<ArangoEdgeResponse<TR>> RemoveAsync<T, TR>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoEdgeResponse<TR>> RemoveAsync<T, TR>(ArangoHandle database, string graph, string collection,
             string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
diff --git a/Core.Arango/Modules/IArangoGraphModule.cs b/Core.Arango/Modules/IArangoGraphModule.cs
index bd3c275c74..188d073a40 100644
--- a/Core.Arango/Modules/IArangoGraphModule.cs
+++ b/Core.Arango/Modules/IArangoGraphModule.cs
@@ -23,40 +23,40 @@ public interface IArangoGraphModule
         /// <summary>
         ///     Create a new graph in the graph module.
         /// </summary>
-        Task CreateAsync(ArangoHandle database, ArangoGraph request, CancellationToken cancellationToken = default);
+        ValueTask CreateAsync(ArangoHandle database, ArangoGraph request, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Delete an existing graph.
         /// </summary>
-        Task DropAsync(ArangoHandle database, string name, CancellationToken cancellationToken = default);
+        ValueTask DropAsync(ArangoHandle database, string name, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Lists all graphs known to the graph module.
         /// </summary>
-        Task<IReadOnlyCollection<ArangoGraph>> ListAsync(ArangoHandle database,
+        ValueTask<IReadOnlyCollection<ArangoGraph>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Get a graph from the graph module.
         /// </summary>
-        Task<ArangoGraph> GetAsync(ArangoHandle database, string graph, CancellationToken cancellationToken = default);
+        ValueTask<ArangoGraph> GetAsync(ArangoHandle database, string graph, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Add an additional vertex collection to the graph.
         /// </summary>
-        Task AddVertexCollectionAsync(ArangoHandle database, string graph, ArangoVertexCollection vertexCollection,
+        ValueTask AddVertexCollectionAsync(ArangoHandle database, string graph, ArangoVertexCollection vertexCollection,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Add a new edge definition to the graph
         /// </summary>
-        Task AddEdgeDefinitionAsync(ArangoHandle database, string graph, ArangoEdgeDefinition edgeDefinition,
+        ValueTask AddEdgeDefinitionAsync(ArangoHandle database, string graph, ArangoEdgeDefinition edgeDefinition,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Remove a vertex collection form the graph.
         /// </summary>
-        Task RemoveVertexCollectionAsync(ArangoHandle database, string graph, string vertexCollection,
+        ValueTask RemoveVertexCollectionAsync(ArangoHandle database, string graph, string vertexCollection,
             bool? dropCollection = null,
             CancellationToken cancellationToken = default);
 
@@ -64,14 +64,14 @@ Task RemoveVertexCollectionAsync(ArangoHandle database, string graph, string ver
         ///     Replace an existing edge definition
         /// </summary>
         /// <returns></returns>
-        Task ReplaceEdgeDefinitionAsync(ArangoHandle database, string graph, ArangoEdgeDefinition edgeDefinition,
+        ValueTask ReplaceEdgeDefinitionAsync(ArangoHandle database, string graph, ArangoEdgeDefinition edgeDefinition,
             bool? dropCollections = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Remove an edge definition form the graph
         /// </summary>
-        Task RemoveEdgeDefinitionAsync(ArangoHandle database, string graph, string edgeDefinition,
+        ValueTask RemoveEdgeDefinitionAsync(ArangoHandle database, string graph, string edgeDefinition,
             bool? dropCollections = null,
             CancellationToken cancellationToken = default);
     }
diff --git a/Core.Arango/Modules/IArangoGraphVertexModule.cs b/Core.Arango/Modules/IArangoGraphVertexModule.cs
index 9eb7f00f45..709bebe691 100644
--- a/Core.Arango/Modules/IArangoGraphVertexModule.cs
+++ b/Core.Arango/Modules/IArangoGraphVertexModule.cs
@@ -12,13 +12,13 @@ public interface IArangoGraphVertexModule
         /// <summary>
         ///     fetches an existing vertex
         /// </summary>
-        Task<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
+        ValueTask<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Create a new vertex
         /// </summary>
-        Task<ArangoVertexResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoVertexResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph, string collection,
             T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default);
@@ -26,14 +26,14 @@ Task<ArangoVertexResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, str
         /// <summary>
         ///     Create a new vertex
         /// </summary>
-        Task<ArangoVertexResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph, string collection, T doc,
+        ValueTask<ArangoVertexResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph, string collection, T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Update an existing vertex
         /// </summary>
-        Task<ArangoVertexResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoVertexResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -41,7 +41,7 @@ Task<ArangoVertexResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, str
         /// <summary>
         ///     Update an existing vertex
         /// </summary>
-        Task<ArangoVertexResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoVertexResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -49,7 +49,7 @@ Task<ArangoVertexResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string
         /// <summary>
         ///     Replaces an existing vertex
         /// </summary>
-        Task<ArangoVertexResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoVertexResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -57,7 +57,7 @@ Task<ArangoVertexResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, st
         /// <summary>
         ///     Replaces an existing vertex
         /// </summary>
-        Task<ArangoVertexResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoVertexResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph, string collection,
             string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -65,7 +65,7 @@ Task<ArangoVertexResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string
         /// <summary>
         ///     Removes a vertex from a graph
         /// </summary>
-        Task<ArangoVertexResponse<ArangoVoid>> RemoveAsync(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoVertexResponse<ArangoVoid>> RemoveAsync(ArangoHandle database, string graph, string collection,
             string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
@@ -73,7 +73,7 @@ Task<ArangoVertexResponse<ArangoVoid>> RemoveAsync(ArangoHandle database, string
         /// <summary>
         ///     Removes a vertex from a graph
         /// </summary>
-        Task<ArangoVertexResponse<TR>> RemoveAsync<TR>(ArangoHandle database, string graph, string collection,
+        ValueTask<ArangoVertexResponse<TR>> RemoveAsync<TR>(ArangoHandle database, string graph, string collection,
             string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default);
diff --git a/Core.Arango/Modules/IArangoIndexModule.cs b/Core.Arango/Modules/IArangoIndexModule.cs
index 896af87858..ba1458df85 100644
--- a/Core.Arango/Modules/IArangoIndexModule.cs
+++ b/Core.Arango/Modules/IArangoIndexModule.cs
@@ -13,23 +13,23 @@ public interface IArangoIndexModule
         /// <summary>
         ///     creates an index
         /// </summary>
-        Task CreateAsync(ArangoHandle database, string collection, ArangoIndex request,
+        ValueTask CreateAsync(ArangoHandle database, string collection, ArangoIndex request,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Drops all indices of a database
         /// </summary>
-        Task DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default);
+        ValueTask DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Drops an index
         /// </summary>
-        Task DropAsync(ArangoHandle database, string index, CancellationToken cancellationToken = default);
+        ValueTask DropAsync(ArangoHandle database, string index, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Returns all indexes of a collection
         /// </summary>
-        Task<IReadOnlyCollection<ArangoIndex>> ListAsync(ArangoHandle database, string collection,
+        ValueTask<IReadOnlyCollection<ArangoIndex>> ListAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoPregelModule.cs b/Core.Arango/Modules/IArangoPregelModule.cs
index 9998f31a83..ae093cd028 100644
--- a/Core.Arango/Modules/IArangoPregelModule.cs
+++ b/Core.Arango/Modules/IArangoPregelModule.cs
@@ -12,18 +12,18 @@ public interface IArangoPregelModule
         /// <summary>
         ///     Start the execution of a Pregel algorithm
         /// </summary>
-        Task<string> StartJobAsync(ArangoHandle database, ArangoPregel job,
+        ValueTask<string> StartJobAsync(ArangoHandle database, ArangoPregel job,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Get the status of a Pregel execution
         /// </summary>
-        Task<ArangoPregelStatus> GetJobStatusAsync(ArangoHandle database, string id,
+        ValueTask<ArangoPregelStatus> GetJobStatusAsync(ArangoHandle database, string id,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Cancel an ongoing Pregel execution
         /// </summary>
-        Task DeleteJobAsync(ArangoHandle database, string id, CancellationToken cancellationToken = default);
+        ValueTask DeleteJobAsync(ArangoHandle database, string id, CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoQueryModule.cs b/Core.Arango/Modules/IArangoQueryModule.cs
index f059f9d510..64f4211f5e 100644
--- a/Core.Arango/Modules/IArangoQueryModule.cs
+++ b/Core.Arango/Modules/IArangoQueryModule.cs
@@ -21,7 +21,7 @@ public interface IArangoQueryModule
         /// <param name="projection">RETURN expression</param>
         /// <param name="limit"></param>
         /// <param name="cancellationToken"></param>
-        Task<List<T>> FindAsync<T>(ArangoHandle database, string collection, FormattableString filter,
+        ValueTask<List<T>> FindAsync<T>(ArangoHandle database, string collection, FormattableString filter,
             string projection = null, int limit = 1000, CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -33,26 +33,26 @@ Task<List<T>> FindAsync<T>(ArangoHandle database, string collection, Formattable
         /// <param name="filter">FILTER expression with "x."</param>
         /// <param name="projection">RETURN expression</param>
         /// <param name="cancellationToken"></param>
-        Task<T> SingleOrDefaultAsync<T>(ArangoHandle database, string collection, FormattableString filter,
+        ValueTask<T> SingleOrDefaultAsync<T>(ArangoHandle database, string collection, FormattableString filter,
             string projection = null, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Execute query (Linq provider)
         /// </summary>
-        Task<object> ExecuteAsync(Type type, bool isEnumerable, ArangoHandle database, string query,
+        ValueTask<object> ExecuteAsync(Type type, bool isEnumerable, ArangoHandle database, string query,
             IDictionary<string, object> bindVars, bool? cache = null, bool? fullCount = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Execute query with string interpolated bind parameters
         /// </summary>
-        Task<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, FormattableString query, bool? cache = null,
+        ValueTask<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, FormattableString query, bool? cache = null,
             bool? fullCount = null, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Execute query with bind parameters in dictionary
         /// </summary>
-        Task<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, string query, IDictionary<string, object> bindVars,
+        ValueTask<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, string query, IDictionary<string, object> bindVars,
             bool? cache = null, bool? fullCount = null, CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -82,7 +82,7 @@ IAsyncEnumerable<T> ExecuteStreamAsync<T>(ArangoHandle database, ArangoCursor cu
         /// <summary>
         ///     explain an AQL query and return information about it
         /// </summary>
-        Task<ArangoExplainResult> ExplainAsync(ArangoHandle database, string query,
+        ValueTask<ArangoExplainResult> ExplainAsync(ArangoHandle database, string query,
             IDictionary<string, object> bindVars,
             bool allPlans = false,
             CancellationToken cancellationToken = default);
@@ -90,14 +90,14 @@ Task<ArangoExplainResult> ExplainAsync(ArangoHandle database, string query,
         /// <summary>
         ///     explain an AQL query and return information about it
         /// </summary>
-        Task<ArangoExplainResult> ExplainAsync(ArangoHandle database, FormattableString query,
+        ValueTask<ArangoExplainResult> ExplainAsync(ArangoHandle database, FormattableString query,
             bool allPlans = false,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     parse an AQL query and return information about it
         /// </summary>
-        Task<ArangoParseResult> ParseAsync(ArangoHandle database, string query,
+        ValueTask<ArangoParseResult> ParseAsync(ArangoHandle database, string query,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoTransactionModule.cs b/Core.Arango/Modules/IArangoTransactionModule.cs
index 2b50770fce..3612bea73d 100644
--- a/Core.Arango/Modules/IArangoTransactionModule.cs
+++ b/Core.Arango/Modules/IArangoTransactionModule.cs
@@ -12,23 +12,23 @@ public interface IArangoTransactionModule
         /// <summary>
         ///     Begin a server-side transaction
         /// </summary>
-        Task<ArangoHandle> BeginAsync(ArangoHandle database, ArangoTransaction request,
+        ValueTask<ArangoHandle> BeginAsync(ArangoHandle database, ArangoTransaction request,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Abort a server-side transaction
         /// </summary>
-        Task AbortAsync(ArangoHandle database, CancellationToken cancellationToken = default);
+        ValueTask AbortAsync(ArangoHandle database, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Commit a server-side transaction
         /// </summary>
-        Task CommitAsync(ArangoHandle database, CancellationToken cancellationToken = default);
+        ValueTask CommitAsync(ArangoHandle database, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     execute a server-side (script) transaction
         /// </summary>
-        Task<T> ExecuteAsync<T>(ArangoHandle database, ArangoTransaction request,
+        ValueTask<T> ExecuteAsync<T>(ArangoHandle database, ArangoTransaction request,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoUserModule.cs b/Core.Arango/Modules/IArangoUserModule.cs
index aabf79205f..25155685fa 100644
--- a/Core.Arango/Modules/IArangoUserModule.cs
+++ b/Core.Arango/Modules/IArangoUserModule.cs
@@ -13,34 +13,34 @@ public interface IArangoUserModule
         /// <summary>
         ///     Create a new user.
         /// </summary>
-        Task<bool> CreateAsync(ArangoUser user, CancellationToken cancellationToken = default);
+        ValueTask<bool> CreateAsync(ArangoUser user, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Delete a user permanently.
         /// </summary>
-        Task<bool> DeleteAsync(string user, CancellationToken cancellationToken = default);
+        ValueTask<bool> DeleteAsync(string user, CancellationToken cancellationToken = default);
 
 
         /// <summary>
         ///     Clear the database access level, revert back to the default access level
         /// </summary>
-        Task<bool> DeleteDatabaseAccessAsync(ArangoHandle handle, string user,
+        ValueTask<bool> DeleteDatabaseAccessAsync(ArangoHandle handle, string user,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Lists all users
         /// </summary>
-        Task<IReadOnlyCollection<ArangoUser>> ListAsync(CancellationToken cancellationToken = default);
+        ValueTask<IReadOnlyCollection<ArangoUser>> ListAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Modify attributes of an existing user
         /// </summary>
-        Task<bool> PatchAsync(ArangoUser user, CancellationToken cancellationToken = default);
+        ValueTask<bool> PatchAsync(ArangoUser user, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Set the database access level.
         /// </summary>
-        Task<bool> SetDatabaseAccessAsync(ArangoHandle handle, string user, ArangoAccess access,
+        ValueTask<bool> SetDatabaseAccessAsync(ArangoHandle handle, string user, ArangoAccess access,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/IArangoViewModule.cs b/Core.Arango/Modules/IArangoViewModule.cs
index 81527d61e7..003cb76a80 100644
--- a/Core.Arango/Modules/IArangoViewModule.cs
+++ b/Core.Arango/Modules/IArangoViewModule.cs
@@ -13,34 +13,34 @@ public interface IArangoViewModule
         /// <summary>
         ///     creates an ArangoSearch View
         /// </summary>
-        Task CreateAsync(ArangoHandle database, ArangoView view, CancellationToken cancellationToken = default);
+        ValueTask CreateAsync(ArangoHandle database, ArangoView view, CancellationToken cancellationToken = default);
 
 
         /// <summary>
         ///     changes all properties of an ArangoSearch View
         /// </summary>
-        Task UpdateAsync(ArangoHandle database, ArangoViewUpdate view, CancellationToken cancellationToken = default);
+        ValueTask UpdateAsync(ArangoHandle database, ArangoViewUpdate view, CancellationToken cancellationToken = default);
 
 
         /// <summary>
         ///     partially changes properties of an ArangoSearch View
         /// </summary>
-        Task PatchAsync(ArangoHandle database, ArangoViewPatch view, CancellationToken cancellationToken = default);
+        ValueTask PatchAsync(ArangoHandle database, ArangoViewPatch view, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Drops all Views in database
         /// </summary>
-        Task DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default);
+        ValueTask DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Drops a View
         /// </summary>
-        Task DropAsync(ArangoHandle database, string name, CancellationToken cancellationToken = default);
+        ValueTask DropAsync(ArangoHandle database, string name, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Returns all Views
         /// </summary>
-        Task<IReadOnlyCollection<ArangoViewInformation>> ListAsync(ArangoHandle database,
+        ValueTask<IReadOnlyCollection<ArangoViewInformation>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default);
 
         /// <summary>
@@ -50,7 +50,7 @@ Task<IReadOnlyCollection<ArangoViewInformation>> ListAsync(ArangoHandle database
         /// <param name="view"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<ArangoView> GetPropertiesAsync(ArangoHandle database, string view,
+        ValueTask<ArangoView> GetPropertiesAsync(ArangoHandle database, string view,
             CancellationToken cancellationToken = default);
     }
 }
\ No newline at end of file
diff --git a/Core.Arango/Modules/Internal/ArangoAnalyzerModule.cs b/Core.Arango/Modules/Internal/ArangoAnalyzerModule.cs
index d7c522c930..3b742c2de6 100644
--- a/Core.Arango/Modules/Internal/ArangoAnalyzerModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoAnalyzerModule.cs
@@ -13,7 +13,7 @@ internal ArangoAnalyzerModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<IReadOnlyCollection<ArangoAnalyzer>> ListAsync(ArangoHandle database,
+        public async ValueTask<IReadOnlyCollection<ArangoAnalyzer>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default)
         {
             return (await SendAsync<QueryResponse<ArangoAnalyzer>>(database, HttpMethod.Get,
@@ -21,7 +21,7 @@ public async Task<IReadOnlyCollection<ArangoAnalyzer>> ListAsync(ArangoHandle da
                 cancellationToken: cancellationToken)).Result;
         }
 
-        public async Task<ArangoAnalyzer> GetDefinitionAsync(ArangoHandle database, string analyzer,
+        public async ValueTask<ArangoAnalyzer> GetDefinitionAsync(ArangoHandle database, string analyzer,
             CancellationToken cancellationToken = default)
         {
             return await SendAsync<ArangoAnalyzer>(database, HttpMethod.Get,
@@ -29,7 +29,7 @@ public async Task<ArangoAnalyzer> GetDefinitionAsync(ArangoHandle database, stri
                 cancellationToken: cancellationToken);
         }
 
-        public async Task CreateAsync(ArangoHandle database,
+        public async ValueTask CreateAsync(ArangoHandle database,
             ArangoAnalyzer analyzer,
             CancellationToken cancellationToken = default)
         {
@@ -39,7 +39,7 @@ await SendAsync<QueryResponse<ArangoVoid>>(database, HttpMethod.Post,
                 cancellationToken: cancellationToken);
         }
 
-        public async Task DeleteAsync(ArangoHandle database,
+        public async ValueTask DeleteAsync(ArangoHandle database,
             string analyzer, bool force = false,
             CancellationToken cancellationToken = default)
         {
diff --git a/Core.Arango/Modules/Internal/ArangoBackupModule.cs b/Core.Arango/Modules/Internal/ArangoBackupModule.cs
index fb38690d44..2fc147c3ee 100644
--- a/Core.Arango/Modules/Internal/ArangoBackupModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoBackupModule.cs
@@ -14,7 +14,7 @@ internal ArangoBackupModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<ArangoBackup> CreateAsync(ArangoBackupRequest request,
+        public async ValueTask<ArangoBackup> CreateAsync(ArangoBackupRequest request,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<SingleResult<ArangoBackup>>(null, HttpMethod.Post, "/_admin/backup/create",
@@ -23,7 +23,7 @@ public async Task<ArangoBackup> CreateAsync(ArangoBackupRequest request,
             return res.Result;
         }
 
-        public async Task RestoreAsync(string id, CancellationToken cancellationToken = default)
+        public async ValueTask RestoreAsync(string id, CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(null, HttpMethod.Post, "/_admin/backup/restore",
                 new
@@ -32,7 +32,7 @@ await SendAsync<ArangoVoid>(null, HttpMethod.Post, "/_admin/backup/restore",
                 }, cancellationToken: cancellationToken);
         }
 
-        public async Task DeleteAsync(string id, CancellationToken cancellationToken = default)
+        public async ValueTask DeleteAsync(string id, CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(null, HttpMethod.Post, "/_admin/backup/delete",
                 new
@@ -41,7 +41,7 @@ await SendAsync<ArangoVoid>(null, HttpMethod.Post, "/_admin/backup/delete",
                 }, cancellationToken: cancellationToken);
         }
 
-        public async Task<List<ArangoBackup>> ListAsync(string id = null, CancellationToken cancellationToken = default)
+        public async ValueTask<List<ArangoBackup>> ListAsync(string id = null, CancellationToken cancellationToken = default)
         {
             object req = null;
 
diff --git a/Core.Arango/Modules/Internal/ArangoCollectionModule.cs b/Core.Arango/Modules/Internal/ArangoCollectionModule.cs
index 0841fd8830..02c921302e 100644
--- a/Core.Arango/Modules/Internal/ArangoCollectionModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoCollectionModule.cs
@@ -14,7 +14,7 @@ public ArangoCollectionModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task CreateAsync(ArangoHandle database, string collection, ArangoCollectionType type,
+        public async ValueTask CreateAsync(ArangoHandle database, string collection, ArangoCollectionType type,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Post,
@@ -26,7 +26,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
                 }, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task CreateAsync(ArangoHandle database, ArangoCollection collection,
+        public async ValueTask CreateAsync(ArangoHandle database, ArangoCollection collection,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Post,
@@ -35,7 +35,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task TruncateAsync(ArangoHandle database, string collection,
+        public async ValueTask TruncateAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Put,
@@ -43,7 +43,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Put,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<IReadOnlyCollection<ArangoCollection>> ListAsync(ArangoHandle database,
+        public async ValueTask<IReadOnlyCollection<ArangoCollection>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<QueryResponse<ArangoCollection>>(database, HttpMethod.Get,
@@ -52,7 +52,7 @@ public async Task<IReadOnlyCollection<ArangoCollection>> ListAsync(ArangoHandle
             return res.Result;
         }
 
-        public async Task UpdateAsync(ArangoHandle database, string collection, ArangoCollectionUpdate update,
+        public async ValueTask UpdateAsync(ArangoHandle database, string collection, ArangoCollectionUpdate update,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Put,
@@ -61,7 +61,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Put,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task RenameAsync(ArangoHandle database, string oldname, string newname,
+        public async ValueTask RenameAsync(ArangoHandle database, string oldname, string newname,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Put,
@@ -73,7 +73,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Put,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<bool> ExistAsync(ArangoHandle database, string collection,
+        public async ValueTask<bool> ExistAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default)
         {
             var collections = await ListAsync(database, cancellationToken).ConfigureAwait(false);
@@ -81,7 +81,7 @@ public async Task<bool> ExistAsync(ArangoHandle database, string collection,
             return collections.Any(x => x.Name.Equals(collection));
         }
 
-        public async Task CompactAsync(ArangoHandle database, string collection,
+        public async ValueTask CompactAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(
@@ -90,7 +90,7 @@ await SendAsync<ArangoVoid>(
                 null, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task RecalculateCountAsync(ArangoHandle database, string collection,
+        public async ValueTask RecalculateCountAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(
@@ -99,7 +99,7 @@ await SendAsync<ArangoVoid>(
                 null, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ArangoCollection> GetAsync(ArangoHandle database, string collection,
+        public async ValueTask<ArangoCollection> GetAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default)
         {
             return await SendAsync<ArangoCollection>(
@@ -108,7 +108,7 @@ public async Task<ArangoCollection> GetAsync(ArangoHandle database, string colle
                 null, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task DropAsync(ArangoHandle database, string collection,
+        public async ValueTask DropAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
diff --git a/Core.Arango/Modules/Internal/ArangoDatabaseModule.cs b/Core.Arango/Modules/Internal/ArangoDatabaseModule.cs
index ec4782c8c8..1add6a5e42 100644
--- a/Core.Arango/Modules/Internal/ArangoDatabaseModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoDatabaseModule.cs
@@ -14,7 +14,7 @@ internal ArangoDatabaseModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<bool> CreateAsync(ArangoHandle name, CancellationToken cancellationToken = default)
+        public async ValueTask<bool> CreateAsync(ArangoHandle name, CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoVoid>(null, HttpMethod.Post,
                 ApiPath("_system", "database"),
@@ -26,7 +26,7 @@ public async Task<bool> CreateAsync(ArangoHandle name, CancellationToken cancell
             return res != null;
         }
 
-        public async Task<bool> CreateAsync(ArangoDatabase database, CancellationToken cancellationToken = default)
+        public async ValueTask<bool> CreateAsync(ArangoDatabase database, CancellationToken cancellationToken = default)
         {
             database.Name = RealmPrefix(database.Name);
 
@@ -37,7 +37,7 @@ public async Task<bool> CreateAsync(ArangoDatabase database, CancellationToken c
             return res != null;
         }
 
-        public async Task<ArangoDatabaseInfo> GetAsync(ArangoHandle handle,
+        public async ValueTask<ArangoDatabaseInfo> GetAsync(ArangoHandle handle,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<SingleResult<ArangoDatabaseInfo>>(null, HttpMethod.Get,
@@ -47,7 +47,7 @@ public async Task<ArangoDatabaseInfo> GetAsync(ArangoHandle handle,
             return res?.Result;
         }
 
-        public async Task<List<string>> ListAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<List<string>> ListAsync(CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<QueryResponse<string>>(null, HttpMethod.Get,
                 ApiPath("_system", "database"), cancellationToken: cancellationToken);
@@ -62,13 +62,13 @@ public async Task<List<string>> ListAsync(CancellationToken cancellationToken =
                 .ToList();
         }
 
-        public async Task<bool> ExistAsync(ArangoHandle handle, CancellationToken cancellationToken = default)
+        public async ValueTask<bool> ExistAsync(ArangoHandle handle, CancellationToken cancellationToken = default)
         {
             var db = await GetAsync(handle, cancellationToken);
             return db != null;
         }
 
-        public async Task DropAsync(ArangoHandle name, CancellationToken cancellationToken = default)
+        public async ValueTask DropAsync(ArangoHandle name, CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(name, HttpMethod.Delete,
                 ApiPath("_system", $"database/{RealmPrefix(name)}"), null,
diff --git a/Core.Arango/Modules/Internal/ArangoDocumentModule.cs b/Core.Arango/Modules/Internal/ArangoDocumentModule.cs
index f1970b6858..de75d06fea 100644
--- a/Core.Arango/Modules/Internal/ArangoDocumentModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoDocumentModule.cs
@@ -15,7 +15,7 @@ internal ArangoDocumentModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<T> GetAsync<T>(ArangoHandle database, string collection, string key,
+        public async ValueTask<T> GetAsync<T>(ArangoHandle database, string collection, string key,
             bool throwOnError = true,
             string ifMatch = null,
             string ifNoneMatch = null,
@@ -33,7 +33,7 @@ public async Task<T> GetAsync<T>(ArangoHandle database, string collection, strin
                 null, throwOnError, headers: headers, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<List<T>> GetManyAsync<T>(ArangoHandle database, string collection, IEnumerable<object> docs,
+        public async ValueTask<List<T>> GetManyAsync<T>(ArangoHandle database, string collection, IEnumerable<object> docs,
             bool? ignoreRevs = null,
             CancellationToken cancellationToken = default)
         {
@@ -48,7 +48,7 @@ public async Task<List<T>> GetManyAsync<T>(ArangoHandle database, string collect
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<List<ArangoUpdateResult<TR>>> CreateManyAsync<T, TR>(ArangoHandle database,
+        public async ValueTask<List<ArangoUpdateResult<TR>>> CreateManyAsync<T, TR>(ArangoHandle database,
             string collection, IEnumerable<T> docs, bool? waitForSync = null,
             bool? keepNull = null, bool? mergeObjects = null, bool? returnOld = null, bool? returnNew = null,
             bool? silent = null, bool? exclusive = null, ArangoOverwriteMode? overwriteMode = null,
@@ -86,7 +86,7 @@ public async Task<List<ArangoUpdateResult<TR>>> CreateManyAsync<T, TR>(ArangoHan
                 docs, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<List<ArangoUpdateResult<ArangoVoid>>> CreateManyAsync<T>(ArangoHandle database,
+        public async ValueTask<List<ArangoUpdateResult<ArangoVoid>>> CreateManyAsync<T>(ArangoHandle database,
             string collection, IEnumerable<T> docs, bool? waitForSync = null,
             bool? keepNull = null, bool? mergeObjects = null, bool? returnOld = null, bool? returnNew = null,
             bool? silent = null, bool? exclusive = null, ArangoOverwriteMode? overwriteMode = null,
@@ -97,7 +97,7 @@ public async Task<List<ArangoUpdateResult<ArangoVoid>>> CreateManyAsync<T>(Arang
                 returnOld, returnNew, silent, exclusive, overwriteMode, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ArangoUpdateResult<TR>> CreateAsync<T, TR>(ArangoHandle database, string collection, T doc,
+        public async ValueTask<ArangoUpdateResult<TR>> CreateAsync<T, TR>(ArangoHandle database, string collection, T doc,
             bool? waitForSync = null,
             bool? keepNull = null, bool? mergeObjects = null, bool? returnOld = null, bool? returnNew = null,
             bool? silent = null, bool? exclusive = null, ArangoOverwriteMode? overwriteMode = null,
@@ -110,7 +110,7 @@ public async Task<ArangoUpdateResult<TR>> CreateAsync<T, TR>(ArangoHandle databa
             return res?.SingleOrDefault();
         }
 
-        public async Task<ArangoUpdateResult<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string collection,
+        public async ValueTask<ArangoUpdateResult<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string collection,
             T doc,
             bool? waitForSync = null, bool? keepNull = null,
             bool? mergeObjects = null, bool? returnOld = null, bool? returnNew = null, bool? silent = null,
@@ -123,7 +123,7 @@ public async Task<ArangoUpdateResult<ArangoVoid>> CreateAsync<T>(ArangoHandle da
             return res?.SingleOrDefault();
         }
 
-        public async Task ImportAsync<T>(ArangoHandle database, string collection, IEnumerable<T> docs,
+        public async ValueTask ImportAsync<T>(ArangoHandle database, string collection, IEnumerable<T> docs,
             bool complete = true,
             CancellationToken cancellationToken = default)
         {
@@ -140,7 +140,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post, query,
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoUpdateResult<TR>> DeleteAsync<TR>(ArangoHandle database, string collection,
+        public async ValueTask<ArangoUpdateResult<TR>> DeleteAsync<TR>(ArangoHandle database, string collection,
             string key,
             bool? waitForSync = null,
             bool? returnOld = null,
@@ -176,7 +176,7 @@ public async Task<ArangoUpdateResult<TR>> DeleteAsync<TR>(ArangoHandle database,
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<List<ArangoUpdateResult<TR>>> DeleteManyAsync<T, TR>(ArangoHandle database,
+        public async ValueTask<List<ArangoUpdateResult<TR>>> DeleteManyAsync<T, TR>(ArangoHandle database,
             string collection, IEnumerable<T> docs,
             bool? waitForSync = null,
             bool? returnOld = null,
@@ -206,7 +206,7 @@ public async Task<List<ArangoUpdateResult<TR>>> DeleteManyAsync<T, TR>(ArangoHan
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<List<ArangoUpdateResult<ArangoVoid>>> UpdateManyAsync<T>(ArangoHandle database,
+        public async ValueTask<List<ArangoUpdateResult<ArangoVoid>>> UpdateManyAsync<T>(ArangoHandle database,
             string collection, IEnumerable<T> docs,
             bool? waitForSync = null,
             bool? keepNull = null,
@@ -223,7 +223,7 @@ public async Task<List<ArangoUpdateResult<ArangoVoid>>> UpdateManyAsync<T>(Arang
                 returnOld, returnNew, silent, ignoreRevs, exclusive, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<List<ArangoUpdateResult<TR>>> UpdateManyAsync<T, TR>(ArangoHandle database,
+        public async ValueTask<List<ArangoUpdateResult<TR>>> UpdateManyAsync<T, TR>(ArangoHandle database,
             string collection, IEnumerable<T> docs,
             bool? waitForSync = null,
             bool? keepNull = null,
@@ -268,7 +268,7 @@ public async Task<List<ArangoUpdateResult<TR>>> UpdateManyAsync<T, TR>(ArangoHan
                 docs, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ArangoUpdateResult<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string collection,
+        public async ValueTask<ArangoUpdateResult<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string collection,
             T doc,
             bool? waitForSync = null,
             bool? keepNull = null,
@@ -287,7 +287,7 @@ public async Task<ArangoUpdateResult<ArangoVoid>> UpdateAsync<T>(ArangoHandle da
             return res.SingleOrDefault();
         }
 
-        public async Task<ArangoUpdateResult<TR>> UpdateAsync<T, TR>(ArangoHandle database, string collection,
+        public async ValueTask<ArangoUpdateResult<TR>> UpdateAsync<T, TR>(ArangoHandle database, string collection,
             T doc,
             bool? waitForSync = null,
             bool? keepNull = null,
@@ -306,7 +306,7 @@ public async Task<ArangoUpdateResult<TR>> UpdateAsync<T, TR>(ArangoHandle databa
             return res?.SingleOrDefault();
         }
 
-        public async Task<List<ArangoUpdateResult<TR>>> ReplaceManyAsync<T, TR>(ArangoHandle database,
+        public async ValueTask<List<ArangoUpdateResult<TR>>> ReplaceManyAsync<T, TR>(ArangoHandle database,
             string collection, IEnumerable<T> docs,
             bool? waitForSync = null,
             bool? returnOld = null,
@@ -339,7 +339,7 @@ public async Task<List<ArangoUpdateResult<TR>>> ReplaceManyAsync<T, TR>(ArangoHa
                 docs, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<List<ArangoUpdateResult<ArangoVoid>>> ReplaceManyAsync<T>(ArangoHandle database,
+        public async ValueTask<List<ArangoUpdateResult<ArangoVoid>>> ReplaceManyAsync<T>(ArangoHandle database,
             string collection, IEnumerable<T> docs,
             bool? waitForSync = null,
             bool? returnOld = null,
@@ -352,7 +352,7 @@ public async Task<List<ArangoUpdateResult<ArangoVoid>>> ReplaceManyAsync<T>(Aran
                 waitForSync, returnOld, returnNew, ignoreRevs, exclusive, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ArangoUpdateResult<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string collection,
+        public async ValueTask<ArangoUpdateResult<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string collection,
             T doc,
             bool waitForSync = false,
             bool? returnOld = null,
@@ -367,7 +367,7 @@ public async Task<ArangoUpdateResult<TR>> ReplaceAsync<T, TR>(ArangoHandle datab
             return res?.SingleOrDefault();
         }
 
-        public async Task<ArangoUpdateResult<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string collection,
+        public async ValueTask<ArangoUpdateResult<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string collection,
             T doc,
             bool waitForSync = false,
             bool? returnOld = null,
diff --git a/Core.Arango/Modules/Internal/ArangoFoxxModule.cs b/Core.Arango/Modules/Internal/ArangoFoxxModule.cs
index 98eb2af3c8..d26e73023d 100644
--- a/Core.Arango/Modules/Internal/ArangoFoxxModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoFoxxModule.cs
@@ -15,7 +15,7 @@ internal ArangoFoxxModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<ICollection<ArangoFoxxService>> ListServicesAsync(ArangoHandle database,
+        public async ValueTask<ICollection<ArangoFoxxService>> ListServicesAsync(ArangoHandle database,
             bool? excludeSystem = null,
             CancellationToken cancellationToken = default)
         {
@@ -29,7 +29,7 @@ public async Task<ICollection<ArangoFoxxService>> ListServicesAsync(ArangoHandle
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVoid> InstallServiceAsync(ArangoHandle database,
+        public async ValueTask<ArangoVoid> InstallServiceAsync(ArangoHandle database,
             string mount, ArangoFoxxSource service,
             bool? development = null, bool? setup = null, bool? legacy = null,
             CancellationToken cancellationToken = default)
@@ -52,7 +52,7 @@ public async Task<ArangoVoid> InstallServiceAsync(ArangoHandle database,
             return new ArangoVoid();
         }
 
-        public async Task<ArangoVoid> ReplaceServiceAsync(ArangoHandle database,
+        public async ValueTask<ArangoVoid> ReplaceServiceAsync(ArangoHandle database,
             string mount, ArangoFoxxSource service,
             bool? teardown = null, bool? setup = null, bool? legacy = null, bool? force = null,
             CancellationToken cancellationToken = default)
@@ -78,7 +78,7 @@ public async Task<ArangoVoid> ReplaceServiceAsync(ArangoHandle database,
             return new ArangoVoid();
         }
 
-        public async Task<ArangoVoid> UpgradeServiceAsync(ArangoHandle database,
+        public async ValueTask<ArangoVoid> UpgradeServiceAsync(ArangoHandle database,
             string mount, ArangoFoxxSource service,
             bool? teardown = null, bool? setup = null, bool? legacy = null, bool? force = null,
             CancellationToken cancellationToken = default)
@@ -104,7 +104,7 @@ public async Task<ArangoVoid> UpgradeServiceAsync(ArangoHandle database,
             return new ArangoVoid();
         }
 
-        public async Task<ArangoVoid> UninstallServiceAsync(ArangoHandle database, string mount,
+        public async ValueTask<ArangoVoid> UninstallServiceAsync(ArangoHandle database, string mount,
             bool? teardown = null,
             CancellationToken cancellationToken = default)
         {
@@ -118,7 +118,7 @@ public async Task<ArangoVoid> UninstallServiceAsync(ArangoHandle database, strin
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<T> GetConfigurationAsync<T>(ArangoHandle database, string mount,
+        public async ValueTask<T> GetConfigurationAsync<T>(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default)
         {
             var parameter = new Dictionary<string, string> { { "mount", mount } };
@@ -128,7 +128,7 @@ public async Task<T> GetConfigurationAsync<T>(ArangoHandle database, string moun
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVoid> UpdateConfigurationAsync(ArangoHandle database, string mount,
+        public async ValueTask<ArangoVoid> UpdateConfigurationAsync(ArangoHandle database, string mount,
             object configuration,
             CancellationToken cancellationToken = default)
         {
@@ -139,7 +139,7 @@ public async Task<ArangoVoid> UpdateConfigurationAsync(ArangoHandle database, st
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVoid> ReplaceConfigurationAsync(ArangoHandle database, string mount,
+        public async ValueTask<ArangoVoid> ReplaceConfigurationAsync(ArangoHandle database, string mount,
             object configuration,
             CancellationToken cancellationToken = default)
         {
@@ -150,7 +150,7 @@ public async Task<ArangoVoid> ReplaceConfigurationAsync(ArangoHandle database, s
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<T> GetDependenciesAsync<T>(ArangoHandle database, string mount,
+        public async ValueTask<T> GetDependenciesAsync<T>(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default)
         {
             var parameter = new Dictionary<string, string> { { "mount", mount } };
@@ -160,7 +160,7 @@ public async Task<T> GetDependenciesAsync<T>(ArangoHandle database, string mount
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVoid> UpdateDependenciesAsync(ArangoHandle database, string mount,
+        public async ValueTask<ArangoVoid> UpdateDependenciesAsync(ArangoHandle database, string mount,
             object dependencies,
             CancellationToken cancellationToken = default)
         {
@@ -171,7 +171,7 @@ public async Task<ArangoVoid> UpdateDependenciesAsync(ArangoHandle database, str
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVoid> ReplaceDependenciesAsync(ArangoHandle database, string mount,
+        public async ValueTask<ArangoVoid> ReplaceDependenciesAsync(ArangoHandle database, string mount,
             object dependencies,
             CancellationToken cancellationToken = default)
         {
@@ -182,7 +182,7 @@ public async Task<ArangoVoid> ReplaceDependenciesAsync(ArangoHandle database, st
                 cancellationToken: cancellationToken);
         }
 
-        public async Task EnableDevelopmentModeAsync(ArangoHandle database, string mount,
+        public async ValueTask EnableDevelopmentModeAsync(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default)
         {
             var parameter = new Dictionary<string, string> { { "mount", mount } };
@@ -192,7 +192,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
                 cancellationToken: cancellationToken);
         }
 
-        public async Task DisableDevelopmentModeAsync(ArangoHandle database, string mount,
+        public async ValueTask DisableDevelopmentModeAsync(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default)
         {
             var parameter = new Dictionary<string, string> { { "mount", mount } };
@@ -202,7 +202,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<T> GetAsync<T>(ArangoHandle database, string mount,
+        public async ValueTask<T> GetAsync<T>(ArangoHandle database, string mount,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default)
         {
@@ -211,7 +211,7 @@ public async Task<T> GetAsync<T>(ArangoHandle database, string mount,
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<T> PostAsync<T>(ArangoHandle database, string mount, object body,
+        public async ValueTask<T> PostAsync<T>(ArangoHandle database, string mount, object body,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default)
         {
@@ -220,7 +220,7 @@ public async Task<T> PostAsync<T>(ArangoHandle database, string mount, object bo
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<T> PutAsync<T>(ArangoHandle database, string mount, object body,
+        public async ValueTask<T> PutAsync<T>(ArangoHandle database, string mount, object body,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default)
         {
@@ -229,7 +229,7 @@ public async Task<T> PutAsync<T>(ArangoHandle database, string mount, object bod
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<T> PatchAsync<T>(ArangoHandle database, string mount, object body,
+        public async ValueTask<T> PatchAsync<T>(ArangoHandle database, string mount, object body,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default)
         {
@@ -238,7 +238,7 @@ public async Task<T> PatchAsync<T>(ArangoHandle database, string mount, object b
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<T> DeleteAsync<T>(ArangoHandle database, string mount,
+        public async ValueTask<T> DeleteAsync<T>(ArangoHandle database, string mount,
             IDictionary<string, string> queryParams = null,
             CancellationToken cancellationToken = default)
         {
@@ -247,7 +247,7 @@ public async Task<T> DeleteAsync<T>(ArangoHandle database, string mount,
                 cancellationToken: cancellationToken);
         }
 
-        public async Task<Stream> DownloadServiceAsync<T>(ArangoHandle database, string mount,
+        public async ValueTask<Stream> DownloadServiceAsync<T>(ArangoHandle database, string mount,
             CancellationToken cancellationToken = default)
         {
             var parameter = new Dictionary<string, string> { { "mount", mount } };
@@ -259,7 +259,7 @@ public async Task<Stream> DownloadServiceAsync<T>(ArangoHandle database, string
             return await res.ReadAsStreamAsync();
         }
 
-        public async Task<T> RunServiceScriptAsync<T>(ArangoHandle database, string mount, string name,
+        public async ValueTask<T> RunServiceScriptAsync<T>(ArangoHandle database, string mount, string name,
             object body = null,
             CancellationToken cancellationToken = default)
         {
diff --git a/Core.Arango/Modules/Internal/ArangoFunctionModule.cs b/Core.Arango/Modules/Internal/ArangoFunctionModule.cs
index 74c1c14982..609706af17 100644
--- a/Core.Arango/Modules/Internal/ArangoFunctionModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoFunctionModule.cs
@@ -16,7 +16,7 @@ internal ArangoFunctionModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<bool> CreateAsync(ArangoHandle database, ArangoFunctionDefinition request,
+        public async ValueTask<bool> CreateAsync(ArangoHandle database, ArangoFunctionDefinition request,
             CancellationToken cancellationToken = default)
         {
             if (request == null)
@@ -28,7 +28,7 @@ public async Task<bool> CreateAsync(ArangoHandle database, ArangoFunctionDefinit
             return res.IsNewlyCreated;
         }
 
-        public async Task<int> RemoveAsync(ArangoHandle database, string name, bool? group = false,
+        public async ValueTask<int> RemoveAsync(ArangoHandle database, string name, bool? group = false,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<FunctionRemoveResponse>(database, HttpMethod.Delete,
@@ -38,7 +38,7 @@ public async Task<int> RemoveAsync(ArangoHandle database, string name, bool? gro
             return res.DeletedCount;
         }
 
-        public async Task<IReadOnlyCollection<ArangoFunctionDefinition>> ListAsync(ArangoHandle database,
+        public async ValueTask<IReadOnlyCollection<ArangoFunctionDefinition>> ListAsync(ArangoHandle database,
             string ns = null,
             CancellationToken cancellationToken = default)
         {
diff --git a/Core.Arango/Modules/Internal/ArangoGraphEdgeModule.cs b/Core.Arango/Modules/Internal/ArangoGraphEdgeModule.cs
index 2f0276b77e..42d96754d4 100644
--- a/Core.Arango/Modules/Internal/ArangoGraphEdgeModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoGraphEdgeModule.cs
@@ -12,7 +12,7 @@ internal ArangoGraphEdgeModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
+        public async ValueTask<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoEdgeResponse<TR>>(database, HttpMethod.Get,
@@ -22,7 +22,7 @@ public async Task<TR> GetAsync<TR>(ArangoHandle database, string graph, string c
             return res.Edge;
         }
 
-        public async Task<ArangoEdgeResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph,
             string collection, T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default)
@@ -31,7 +31,7 @@ public async Task<ArangoEdgeResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle da
                 cancellationToken);
         }
 
-        public async Task<ArangoEdgeResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -40,7 +40,7 @@ public async Task<ArangoEdgeResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle da
                 returnNew, returnOld, cancellationToken);
         }
 
-        public async Task<ArangoEdgeResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -49,7 +49,7 @@ public async Task<ArangoEdgeResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle d
                 returnNew, returnOld, cancellationToken);
         }
 
-        public async Task<ArangoEdgeResponse<ArangoVoid>> RemoveAsync<T>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<ArangoVoid>> RemoveAsync<T>(ArangoHandle database, string graph,
             string collection, string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -58,7 +58,7 @@ public async Task<ArangoEdgeResponse<ArangoVoid>> RemoveAsync<T>(ArangoHandle da
                 cancellationToken);
         }
 
-        public async Task<ArangoEdgeResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph,
             string collection, T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default)
@@ -76,7 +76,7 @@ public async Task<ArangoEdgeResponse<TR>> CreateAsync<T, TR>(ArangoHandle databa
                 doc, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoEdgeResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -100,7 +100,7 @@ public async Task<ArangoEdgeResponse<TR>> UpdateAsync<T, TR>(ArangoHandle databa
                 doc, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoEdgeResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -124,7 +124,7 @@ public async Task<ArangoEdgeResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle datab
                 doc, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoEdgeResponse<TR>> RemoveAsync<T, TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoEdgeResponse<TR>> RemoveAsync<T, TR>(ArangoHandle database, string graph,
             string collection, string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
diff --git a/Core.Arango/Modules/Internal/ArangoGraphModule.cs b/Core.Arango/Modules/Internal/ArangoGraphModule.cs
index 190d7d4986..cc310c4016 100644
--- a/Core.Arango/Modules/Internal/ArangoGraphModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoGraphModule.cs
@@ -17,7 +17,7 @@ internal ArangoGraphModule(IArangoContext context) : base(context)
             Edge = new ArangoGraphEdgeModule(context);
         }
 
-        public async Task<IReadOnlyCollection<ArangoGraph>> ListAsync(ArangoHandle database,
+        public async ValueTask<IReadOnlyCollection<ArangoGraph>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<GraphsResponse<ArangoGraph>>(database, HttpMethod.Get,
@@ -25,7 +25,7 @@ public async Task<IReadOnlyCollection<ArangoGraph>> ListAsync(ArangoHandle datab
             return res.Graphs;
         }
 
-        public async Task<ArangoGraph> GetAsync(ArangoHandle database, string graph,
+        public async ValueTask<ArangoGraph> GetAsync(ArangoHandle database, string graph,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<GraphResponse<ArangoGraph>>(database, HttpMethod.Get,
@@ -37,7 +37,7 @@ public async Task<ArangoGraph> GetAsync(ArangoHandle database, string graph,
         public IArangoGraphVertexModule Vertex { get; }
         public IArangoGraphEdgeModule Edge { get; }
 
-        public async Task CreateAsync(ArangoHandle database, ArangoGraph request,
+        public async ValueTask CreateAsync(ArangoHandle database, ArangoGraph request,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Post,
@@ -45,7 +45,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
                 request, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task AddVertexCollectionAsync(ArangoHandle database, string graph,
+        public async ValueTask AddVertexCollectionAsync(ArangoHandle database, string graph,
             ArangoVertexCollection vertexCollection,
             CancellationToken cancellationToken = default)
         {
@@ -54,7 +54,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
                 vertexCollection, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task RemoveVertexCollectionAsync(ArangoHandle database, string graph, string vertexCollection,
+        public async ValueTask RemoveVertexCollectionAsync(ArangoHandle database, string graph, string vertexCollection,
             bool? dropCollection = null,
             CancellationToken cancellationToken = default)
         {
@@ -68,7 +68,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task AddEdgeDefinitionAsync(ArangoHandle database, string graph,
+        public async ValueTask AddEdgeDefinitionAsync(ArangoHandle database, string graph,
             ArangoEdgeDefinition edgeDefinition,
             CancellationToken cancellationToken = default)
         {
@@ -77,7 +77,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
                 edgeDefinition, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task ReplaceEdgeDefinitionAsync(ArangoHandle database, string graph,
+        public async ValueTask ReplaceEdgeDefinitionAsync(ArangoHandle database, string graph,
             ArangoEdgeDefinition edgeDefinition,
             bool? dropCollections = null,
             CancellationToken cancellationToken = default)
@@ -92,7 +92,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Put,
                 edgeDefinition, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task RemoveEdgeDefinitionAsync(ArangoHandle database, string graph, string edgeDefinition,
+        public async ValueTask RemoveEdgeDefinitionAsync(ArangoHandle database, string graph, string edgeDefinition,
             bool? dropCollections = null,
             CancellationToken cancellationToken = default)
         {
@@ -106,7 +106,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task DropAsync(ArangoHandle database, string name,
+        public async ValueTask DropAsync(ArangoHandle database, string name,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
diff --git a/Core.Arango/Modules/Internal/ArangoGraphVertexModule.cs b/Core.Arango/Modules/Internal/ArangoGraphVertexModule.cs
index e2946d2339..7a2b8d69c1 100644
--- a/Core.Arango/Modules/Internal/ArangoGraphVertexModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoGraphVertexModule.cs
@@ -12,7 +12,7 @@ internal ArangoGraphVertexModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
+        public async ValueTask<TR> GetAsync<TR>(ArangoHandle database, string graph, string collection, string key,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoVertexResponse<TR>>(database, HttpMethod.Get,
@@ -22,7 +22,7 @@ public async Task<TR> GetAsync<TR>(ArangoHandle database, string graph, string c
             return res.Vertex;
         }
 
-        public async Task<ArangoVertexResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle database, string graph,
             string collection, T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default)
@@ -31,7 +31,7 @@ public async Task<ArangoVertexResponse<ArangoVoid>> CreateAsync<T>(ArangoHandle
                 cancellationToken);
         }
 
-        public async Task<ArangoVertexResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<TR>> CreateAsync<T, TR>(ArangoHandle database, string graph,
             string collection, T doc,
             bool? waitForSync = null, bool? returnNew = null,
             CancellationToken cancellationToken = default)
@@ -49,7 +49,7 @@ public async Task<ArangoVertexResponse<TR>> CreateAsync<T, TR>(ArangoHandle data
                 doc, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVertexResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -58,7 +58,7 @@ public async Task<ArangoVertexResponse<ArangoVoid>> UpdateAsync<T>(ArangoHandle
                 returnNew, returnOld, cancellationToken);
         }
 
-        public async Task<ArangoVertexResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<TR>> UpdateAsync<T, TR>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -82,7 +82,7 @@ public async Task<ArangoVertexResponse<TR>> UpdateAsync<T, TR>(ArangoHandle data
                 doc, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVertexResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -91,7 +91,7 @@ public async Task<ArangoVertexResponse<ArangoVoid>> ReplaceAsync<T>(ArangoHandle
                 returnNew, returnOld, cancellationToken);
         }
 
-        public async Task<ArangoVertexResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle database, string graph,
             string collection, string key, T doc,
             bool? waitForSync = null, bool? keepNull = null, bool? returnNew = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -115,7 +115,7 @@ public async Task<ArangoVertexResponse<TR>> ReplaceAsync<T, TR>(ArangoHandle dat
                 doc, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoVertexResponse<ArangoVoid>> RemoveAsync(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<ArangoVoid>> RemoveAsync(ArangoHandle database, string graph,
             string collection, string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
@@ -124,7 +124,7 @@ public async Task<ArangoVertexResponse<ArangoVoid>> RemoveAsync(ArangoHandle dat
                 cancellationToken);
         }
 
-        public async Task<ArangoVertexResponse<TR>> RemoveAsync<TR>(ArangoHandle database, string graph,
+        public async ValueTask<ArangoVertexResponse<TR>> RemoveAsync<TR>(ArangoHandle database, string graph,
             string collection, string key,
             bool? waitForSync = null, bool? returnOld = null,
             CancellationToken cancellationToken = default)
diff --git a/Core.Arango/Modules/Internal/ArangoIndexModule.cs b/Core.Arango/Modules/Internal/ArangoIndexModule.cs
index 776acb8234..b33e35ceb9 100644
--- a/Core.Arango/Modules/Internal/ArangoIndexModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoIndexModule.cs
@@ -15,7 +15,7 @@ internal ArangoIndexModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task CreateAsync(ArangoHandle database, string collection, ArangoIndex request,
+        public async ValueTask CreateAsync(ArangoHandle database, string collection, ArangoIndex request,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Post,
@@ -26,7 +26,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
         /// <summary>
         ///     Drops all user created indices over all collections in database
         /// </summary>
-        public async Task DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default)
+        public async ValueTask DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default)
         {
             var collections = await Context.Collection.ListAsync(database, cancellationToken).ConfigureAwait(false);
 
@@ -42,7 +42,7 @@ public async Task DropAllAsync(ArangoHandle database, CancellationToken cancella
         /// <summary>
         ///     Ignores primary and edge indices
         /// </summary>
-        public async Task<IReadOnlyCollection<ArangoIndex>> ListAsync(ArangoHandle database, string collection,
+        public async ValueTask<IReadOnlyCollection<ArangoIndex>> ListAsync(ArangoHandle database, string collection,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<IndexResponse>(database, HttpMethod.Get,
@@ -57,7 +57,7 @@ public async Task<IReadOnlyCollection<ArangoIndex>> ListAsync(ArangoHandle datab
                 }).ToList();
         }
 
-        public async Task DropAsync(ArangoHandle database, string index,
+        public async ValueTask DropAsync(ArangoHandle database, string index,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
diff --git a/Core.Arango/Modules/Internal/ArangoModule.cs b/Core.Arango/Modules/Internal/ArangoModule.cs
index d5d2742eac..bc84dcea3b 100644
--- a/Core.Arango/Modules/Internal/ArangoModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoModule.cs
@@ -68,7 +68,7 @@ protected string UrlEncode(string value)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Task<T> SendAsync<T>(ArangoHandle handle, HttpMethod m,
+        public ValueTask<T> SendAsync<T>(ArangoHandle handle, HttpMethod m,
             string url, object body = null,
             bool throwOnError = true, bool auth = true, IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default)
@@ -82,7 +82,7 @@ public Task<T> SendAsync<T>(ArangoHandle handle, HttpMethod m,
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Task<object> SendAsync(Type type, HttpMethod m, string url, object body = null,
+        public ValueTask<object> SendAsync(Type type, HttpMethod m, string url, object body = null,
             string transaction = null, bool throwOnError = true, bool auth = true,
             IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default)
diff --git a/Core.Arango/Modules/Internal/ArangoPregelModule.cs b/Core.Arango/Modules/Internal/ArangoPregelModule.cs
index ae22e79a8a..552ccca96c 100644
--- a/Core.Arango/Modules/Internal/ArangoPregelModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoPregelModule.cs
@@ -11,7 +11,7 @@ internal ArangoPregelModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<string> StartJobAsync(ArangoHandle database, ArangoPregel job,
+        public async ValueTask<string> StartJobAsync(ArangoHandle database, ArangoPregel job,
             CancellationToken cancellationToken = default)
         {
             return await SendAsync<string>(database, HttpMethod.Post,
@@ -19,7 +19,7 @@ public async Task<string> StartJobAsync(ArangoHandle database, ArangoPregel job,
                 job, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ArangoPregelStatus> GetJobStatusAsync(ArangoHandle database, string id,
+        public async ValueTask<ArangoPregelStatus> GetJobStatusAsync(ArangoHandle database, string id,
             CancellationToken cancellationToken = default)
         {
             return await SendAsync<ArangoPregelStatus>(database, HttpMethod.Get,
@@ -27,7 +27,7 @@ public async Task<ArangoPregelStatus> GetJobStatusAsync(ArangoHandle database, s
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task DeleteJobAsync(ArangoHandle database, string id,
+        public async ValueTask DeleteJobAsync(ArangoHandle database, string id,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
diff --git a/Core.Arango/Modules/Internal/ArangoQueryModule.cs b/Core.Arango/Modules/Internal/ArangoQueryModule.cs
index 3aa3f3515f..92524056fd 100644
--- a/Core.Arango/Modules/Internal/ArangoQueryModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoQueryModule.cs
@@ -16,7 +16,7 @@ internal ArangoQueryModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<List<T>> FindAsync<T>(ArangoHandle database, string collection, FormattableString filter,
+        public async ValueTask<List<T>> FindAsync<T>(ArangoHandle database, string collection, FormattableString filter,
             string projection = null, int limit = 1000, CancellationToken cancellationToken = default)
         {
             var filterExp = Parameterize(filter, out var parameter);
@@ -26,7 +26,7 @@ public async Task<List<T>> FindAsync<T>(ArangoHandle database, string collection
                 parameter, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<T> SingleOrDefaultAsync<T>(ArangoHandle database, string collection, FormattableString filter,
+        public async ValueTask<T> SingleOrDefaultAsync<T>(ArangoHandle database, string collection, FormattableString filter,
             string projection = null, CancellationToken cancellationToken = default)
         {
             var results = await FindAsync<T>(database, collection, filter, projection, 2, cancellationToken)
@@ -37,7 +37,7 @@ public async Task<T> SingleOrDefaultAsync<T>(ArangoHandle database, string colle
             return results.SingleOrDefault();
         }
 
-        public async Task<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, FormattableString query,
+        public async ValueTask<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, FormattableString query,
             bool? cache = null, bool? fullCount = null, CancellationToken cancellationToken = default)
         {
             var queryExp = Parameterize(query, out var parameter);
@@ -46,7 +46,7 @@ public async Task<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, Formatta
                 .ConfigureAwait(false);
         }
 
-        public async Task<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, string query,
+        public async ValueTask<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, string query,
             IDictionary<string, object> bindVars, bool? cache = null, bool? fullCount = null,
             CancellationToken cancellationToken = default)
         {
@@ -102,7 +102,7 @@ public async Task<ArangoList<T>> ExecuteAsync<T>(ArangoHandle database, string q
             }
         }
 
-        public async Task<object> ExecuteAsync(Type type, bool isEnumerable, ArangoHandle database, string query,
+        public async ValueTask<object> ExecuteAsync(Type type, bool isEnumerable, ArangoHandle database, string query,
             IDictionary<string, object> bindVars, bool? cache = null, bool? fullCount = null,
             CancellationToken cancellationToken = default)
         {
@@ -207,7 +207,7 @@ public async IAsyncEnumerable<T> ExecuteStreamAsync<T>(ArangoHandle database, Ar
             }
         }
 
-        public Task<ArangoExplainResult> ExplainAsync(ArangoHandle database, string query,
+        public ValueTask<ArangoExplainResult> ExplainAsync(ArangoHandle database, string query,
             IDictionary<string, object> bindVars,
             bool allPlans = false,
             CancellationToken cancellationToken = default)
@@ -224,7 +224,7 @@ public Task<ArangoExplainResult> ExplainAsync(ArangoHandle database, string quer
                 }, cancellationToken: cancellationToken);
         }
 
-        public Task<ArangoExplainResult> ExplainAsync(ArangoHandle database, FormattableString query,
+        public ValueTask<ArangoExplainResult> ExplainAsync(ArangoHandle database, FormattableString query,
             bool allPlans = false,
             CancellationToken cancellationToken = default)
         {
@@ -233,7 +233,7 @@ public Task<ArangoExplainResult> ExplainAsync(ArangoHandle database, Formattable
             return ExplainAsync(database, queryExp, parameter, allPlans, cancellationToken);
         }
 
-        public Task<ArangoParseResult> ParseAsync(ArangoHandle database, string query,
+        public ValueTask<ArangoParseResult> ParseAsync(ArangoHandle database, string query,
             CancellationToken cancellationToken = default)
         {
             return SendAsync<ArangoParseResult>(database, HttpMethod.Post, ApiPath(database, "query"),
diff --git a/Core.Arango/Modules/Internal/ArangoTransactionModule.cs b/Core.Arango/Modules/Internal/ArangoTransactionModule.cs
index fa97183294..3864dc8dfb 100644
--- a/Core.Arango/Modules/Internal/ArangoTransactionModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoTransactionModule.cs
@@ -12,7 +12,7 @@ internal ArangoTransactionModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task<T> ExecuteAsync<T>(ArangoHandle database, ArangoTransaction request,
+        public async ValueTask<T> ExecuteAsync<T>(ArangoHandle database, ArangoTransaction request,
             CancellationToken cancellationToken = default)
         {
             return await SendAsync<T>(null, HttpMethod.Post,
@@ -20,7 +20,7 @@ public async Task<T> ExecuteAsync<T>(ArangoHandle database, ArangoTransaction re
                 request, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<ArangoHandle> BeginAsync(ArangoHandle database, ArangoTransaction request,
+        public async ValueTask<ArangoHandle> BeginAsync(ArangoHandle database, ArangoTransaction request,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<SingleResult<TransactionResponse>>(null, HttpMethod.Post,
@@ -31,7 +31,7 @@ public async Task<ArangoHandle> BeginAsync(ArangoHandle database, ArangoTransact
             return new ArangoHandle(database, transaction);
         }
 
-        public async Task CommitAsync(ArangoHandle database,
+        public async ValueTask CommitAsync(ArangoHandle database,
             CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrWhiteSpace(database.Transaction))
@@ -42,7 +42,7 @@ await SendAsync<ArangoVoid>(null, HttpMethod.Put,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task AbortAsync(ArangoHandle database, CancellationToken cancellationToken = default)
+        public async ValueTask AbortAsync(ArangoHandle database, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrWhiteSpace(database.Transaction))
                 throw new ArangoException("no transaction handle");
diff --git a/Core.Arango/Modules/Internal/ArangoUserModule.cs b/Core.Arango/Modules/Internal/ArangoUserModule.cs
index d80ee13b03..4ac443af1b 100644
--- a/Core.Arango/Modules/Internal/ArangoUserModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoUserModule.cs
@@ -16,7 +16,7 @@ internal ArangoUserModule(IArangoContext context) : base(context)
         /// <summary>
         ///     Create a new user
         /// </summary>
-        public async Task<bool> CreateAsync(ArangoUser user, CancellationToken cancellationToken = default)
+        public async ValueTask<bool> CreateAsync(ArangoUser user, CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoVoid>(null, HttpMethod.Post,
                 ApiPath("user"), user, cancellationToken: cancellationToken);
@@ -27,7 +27,7 @@ public async Task<bool> CreateAsync(ArangoUser user, CancellationToken cancellat
         /// <summary>
         ///     List available users
         /// </summary>
-        public async Task<IReadOnlyCollection<ArangoUser>> ListAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<IReadOnlyCollection<ArangoUser>> ListAsync(CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<QueryResponse<ArangoUser>>(null, HttpMethod.Get,
                 ApiPath("user"), cancellationToken: cancellationToken);
@@ -37,7 +37,7 @@ public async Task<IReadOnlyCollection<ArangoUser>> ListAsync(CancellationToken c
         /// <summary>
         ///     Set the database access level
         /// </summary>
-        public async Task<bool> SetDatabaseAccessAsync(ArangoHandle handle, string user, ArangoAccess access,
+        public async ValueTask<bool> SetDatabaseAccessAsync(ArangoHandle handle, string user, ArangoAccess access,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoVoid>(null, HttpMethod.Put,
@@ -53,7 +53,7 @@ public async Task<bool> SetDatabaseAccessAsync(ArangoHandle handle, string user,
         /// <summary>
         ///     Clear the database access level, revert back to the default access level
         /// </summary>
-        public async Task<bool> DeleteDatabaseAccessAsync(ArangoHandle handle, string user,
+        public async ValueTask<bool> DeleteDatabaseAccessAsync(ArangoHandle handle, string user,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoVoid>(null, HttpMethod.Delete,
@@ -66,7 +66,7 @@ public async Task<bool> DeleteDatabaseAccessAsync(ArangoHandle handle, string us
         /// <summary>
         ///     Modify attributes of an existing user
         /// </summary>
-        public async Task<bool> PatchAsync(ArangoUser user, CancellationToken cancellationToken = default)
+        public async ValueTask<bool> PatchAsync(ArangoUser user, CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoVoid>(null, PolyfillHelper.Patch,
                 ApiPath($"user/{UrlEncode(user.Name)}"),
@@ -79,7 +79,7 @@ public async Task<bool> PatchAsync(ArangoUser user, CancellationToken cancellati
         /// <summary>
         ///     Delete a user permanently.
         /// </summary>
-        public async Task<bool> DeleteAsync(string user, CancellationToken cancellationToken = default)
+        public async ValueTask<bool> DeleteAsync(string user, CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoVoid>(null, HttpMethod.Delete,
                 ApiPath($"user/{UrlEncode(user)}"), cancellationToken: cancellationToken);
diff --git a/Core.Arango/Modules/Internal/ArangoViewModule.cs b/Core.Arango/Modules/Internal/ArangoViewModule.cs
index 030d62c802..d946693ac2 100644
--- a/Core.Arango/Modules/Internal/ArangoViewModule.cs
+++ b/Core.Arango/Modules/Internal/ArangoViewModule.cs
@@ -13,7 +13,7 @@ internal ArangoViewModule(IArangoContext context) : base(context)
         {
         }
 
-        public async Task CreateAsync(ArangoHandle database, ArangoView view,
+        public async ValueTask CreateAsync(ArangoHandle database, ArangoView view,
             CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Post,
@@ -22,7 +22,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Post,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task UpdateAsync(ArangoHandle database, ArangoViewUpdate view, CancellationToken cancellationToken = default)
+        public async ValueTask UpdateAsync(ArangoHandle database, ArangoViewUpdate view, CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, HttpMethod.Put,
                 ApiPath(database, $"view/{UrlEncode(view.Name)}/properties"),
@@ -30,7 +30,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Put,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task PatchAsync(ArangoHandle database, ArangoViewPatch view, CancellationToken cancellationToken = default)
+        public async ValueTask PatchAsync(ArangoHandle database, ArangoViewPatch view, CancellationToken cancellationToken = default)
         {
             await SendAsync<ArangoVoid>(database, PolyfillHelper.Patch,
                 ApiPath(database, $"view/{UrlEncode(view.Name)}/properties"),
@@ -38,7 +38,7 @@ await SendAsync<ArangoVoid>(database, PolyfillHelper.Patch,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<IReadOnlyCollection<ArangoViewInformation>> ListAsync(ArangoHandle database,
+        public async ValueTask<IReadOnlyCollection<ArangoViewInformation>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<QueryResponse<ArangoViewInformation>>(database, HttpMethod.Get,
@@ -47,7 +47,7 @@ public async Task<IReadOnlyCollection<ArangoViewInformation>> ListAsync(ArangoHa
             return res.Result;
         }
 
-        public async Task<ArangoView> GetPropertiesAsync(ArangoHandle database, string view,
+        public async ValueTask<ArangoView> GetPropertiesAsync(ArangoHandle database, string view,
             CancellationToken cancellationToken = default)
         {
             var res = await SendAsync<ArangoView>(database, HttpMethod.Get,
@@ -56,7 +56,7 @@ public async Task<ArangoView> GetPropertiesAsync(ArangoHandle database, string v
             return res;
         }
 
-        public async Task DropAsync(ArangoHandle database,
+        public async ValueTask DropAsync(ArangoHandle database,
             string name,
             CancellationToken cancellationToken = default)
         {
@@ -65,7 +65,7 @@ await SendAsync<ArangoVoid>(database, HttpMethod.Delete,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default)
+        public async ValueTask DropAllAsync(ArangoHandle database, CancellationToken cancellationToken = default)
         {
             var views = await ListAsync(database, cancellationToken).ConfigureAwait(false);
 
diff --git a/Core.Arango/Transport/ArangoHttpTransport.cs b/Core.Arango/Transport/ArangoHttpTransport.cs
index 304c98b912..134599c33f 100644
--- a/Core.Arango/Transport/ArangoHttpTransport.cs
+++ b/Core.Arango/Transport/ArangoHttpTransport.cs
@@ -35,7 +35,7 @@ public ArangoHttpTransport(IArangoConfiguration configuration)
         }
 
         /// <inheritdoc />
-        public async Task<T> SendAsync<T>(HttpMethod m, string url, object body = null,
+        public async ValueTask<T> SendAsync<T>(HttpMethod m, string url, object body = null,
             string transaction = null, bool throwOnError = true, bool auth = true,
             IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default)
@@ -87,7 +87,7 @@ public async Task<T> SendAsync<T>(HttpMethod m, string url, object body = null,
         }
 
         /// <inheritdoc />
-        public async Task<HttpContent> SendContentAsync(HttpMethod m, string url, HttpContent body = null,
+        public async ValueTask<HttpContent> SendContentAsync(HttpMethod m, string url, HttpContent body = null,
             string transaction = null,
             bool throwOnError = true, bool auth = true, IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default)
@@ -113,7 +113,7 @@ public async Task<HttpContent> SendContentAsync(HttpMethod m, string url, HttpCo
         }
 
         /// <inheritdoc />
-        public async Task<object> SendAsync(Type type, HttpMethod m, string url, object body = null,
+        public async ValueTask<object> SendAsync(Type type, HttpMethod m, string url, object body = null,
             string transaction = null, bool throwOnError = true, bool auth = true,
             IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default)
@@ -170,7 +170,7 @@ private void ApplyHeaders(string transaction, bool auth, HttpRequestMessage msg,
                     msg.Headers.Add(header.Key, header.Value);
         }
 
-        private async Task Authenticate(bool auth, CancellationToken cancellationToken)
+        private async ValueTask Authenticate(bool auth, CancellationToken cancellationToken)
         {
             if (string.IsNullOrWhiteSpace(_configuration.User))
                 return;
diff --git a/Core.Arango/Transport/IArangoTransport.cs b/Core.Arango/Transport/IArangoTransport.cs
index f16f2e0318..8062510694 100644
--- a/Core.Arango/Transport/IArangoTransport.cs
+++ b/Core.Arango/Transport/IArangoTransport.cs
@@ -14,21 +14,21 @@ public interface IArangoTransport
         /// <summary>
         ///     Send request to ArangoDB
         /// </summary>
-        Task<object> SendAsync(Type type, HttpMethod m, string url, object body = null, string transaction = null,
+        ValueTask<object> SendAsync(Type type, HttpMethod m, string url, object body = null, string transaction = null,
             bool throwOnError = true, bool auth = true, IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Send request to ArangoDB
         /// </summary>
-        Task<T> SendAsync<T>(HttpMethod m, string url, object body = null, string transaction = null,
+        ValueTask<T> SendAsync<T>(HttpMethod m, string url, object body = null, string transaction = null,
             bool throwOnError = true, bool auth = true, IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Send raw HTTP content request to ArangoDB
         /// </summary>
-        Task<HttpContent> SendContentAsync(HttpMethod m, string url, HttpContent body = null, string transaction = null,
+        ValueTask<HttpContent> SendContentAsync(HttpMethod m, string url, HttpContent body = null, string transaction = null,
             bool throwOnError = true, bool auth = true, IDictionary<string, string> headers = null,
             CancellationToken cancellationToken = default);
     }