diff --git a/.gitignore b/.gitignore
index 32d1d4da6..e1620feb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ examples/CoreWeb/assets/lib
 # Runtime test files
 [Uu]ploads
 *.db
+*.db-shm
+*.db-wal
 
 templates/**/wwwroot/uploads
 templates/**/*.db
diff --git a/core/Piranha/Runtime/AppMethod.cs b/core/Piranha/Runtime/AppMethod.cs
index b5147a0e4..ed3cb22df 100644
--- a/core/Piranha/Runtime/AppMethod.cs
+++ b/core/Piranha/Runtime/AppMethod.cs
@@ -39,7 +39,7 @@ public sealed class AppMethod
         /// <param name="instance">The object instance</param>
         /// <param name="scope">The current service scope</param>
         /// <returns>An async taks</returns>
-        public Task InvokeAsync(object instance, IServiceScope scope)
+        public async Task InvokeAsync(object instance, IServiceScope scope)
         {
             var param = new List<object>();
             foreach (var type in ParameterTypes)
@@ -49,13 +49,12 @@ public Task InvokeAsync(object instance, IServiceScope scope)
 
             if (IsAsync)
             {
-                return (Task)Method.Invoke(instance, param.ToArray());
+                await ((Task)Method.Invoke(instance, param.ToArray()))
+                    .ConfigureAwait(false);
             }
             else
             {
-                return Task.Run(() => {
-                    Method.Invoke(instance, param.ToArray());
-                });
+                Method.Invoke(instance, param.ToArray());
             }
         }
     }