diff --git a/packages/fl_query/lib/src/core/mutation.dart b/packages/fl_query/lib/src/core/mutation.dart
index 5ccc2cd..91a5d28 100644
--- a/packages/fl_query/lib/src/core/mutation.dart
+++ b/packages/fl_query/lib/src/core/mutation.dart
@@ -71,7 +71,7 @@ class Mutation<DataType, ErrorType, VariablesType>
   Future<void> _operate(VariablesType variables) {
     return _mutex.protect(() async {
       state = state.copyWith();
-      _operation = await cancellableRetryOperation(
+      _operation = cancellableRetryOperation(
         () {
           _mutationController.add(variables);
           return _mutationFn(variables);
diff --git a/packages/fl_query/lib/src/core/provider.dart b/packages/fl_query/lib/src/core/provider.dart
index da1734b..d798eb7 100644
--- a/packages/fl_query/lib/src/core/provider.dart
+++ b/packages/fl_query/lib/src/core/provider.dart
@@ -1,6 +1,6 @@
 import 'package:fl_query/src/core/client.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/src/foundation/diagnostics.dart';
 
 class QueryClientProvider extends InheritedWidget {
   final QueryClient client;
diff --git a/packages/fl_query/lib/src/widgets/infinite_query_builder.dart b/packages/fl_query/lib/src/widgets/infinite_query_builder.dart
index 26a7bbf..16d7dc1 100644
--- a/packages/fl_query/lib/src/widgets/infinite_query_builder.dart
+++ b/packages/fl_query/lib/src/widgets/infinite_query_builder.dart
@@ -6,8 +6,8 @@ import 'package:fl_query/src/collections/retry_config.dart';
 import 'package:fl_query/src/core/client.dart';
 import 'package:fl_query/src/core/infinite_query.dart';
 import 'package:fl_query/src/widgets/mixins/rebuilder.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/src/foundation/diagnostics.dart';
 
 typedef InfiniteQueryBuilderFn<DataType, ErrorType, PageType> = Widget Function(
   BuildContext context,
diff --git a/packages/fl_query/lib/src/widgets/mutation_builder.dart b/packages/fl_query/lib/src/widgets/mutation_builder.dart
index 67b7af1..b5c751f 100644
--- a/packages/fl_query/lib/src/widgets/mutation_builder.dart
+++ b/packages/fl_query/lib/src/widgets/mutation_builder.dart
@@ -4,8 +4,8 @@ import 'package:fl_query/src/collections/retry_config.dart';
 import 'package:fl_query/src/core/client.dart';
 import 'package:fl_query/src/core/mutation.dart';
 import 'package:fl_query/src/widgets/mixins/rebuilder.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/src/foundation/diagnostics.dart';
 
 typedef MutationBuilderFn<DataType, ErrorType, VariablesType> = Widget Function(
   BuildContext context,
diff --git a/packages/fl_query/lib/src/widgets/query_builder.dart b/packages/fl_query/lib/src/widgets/query_builder.dart
index 8491347..ff34a75 100644
--- a/packages/fl_query/lib/src/widgets/query_builder.dart
+++ b/packages/fl_query/lib/src/widgets/query_builder.dart
@@ -7,7 +7,7 @@ import 'package:fl_query/src/core/client.dart';
 import 'package:fl_query/src/core/query.dart';
 import 'package:fl_query/src/widgets/mixins/rebuilder.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/src/foundation/diagnostics.dart';
+import 'package:flutter/foundation.dart';
 
 typedef QueryBuilderFn<DataType, ErrorType> = Widget Function(
   BuildContext context,