diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index be84c1f3..c5c0ebcb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,10 +26,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -40,7 +40,7 @@ jobs:
 
       # Run Flutter Format to ensure formatting is valid
       - name: Run Flutter Format
-        run: flutter format --set-exit-if-changed .
+        run: dart format --set-exit-if-changed .
         working-directory: ${{env.source-directory}}
 
   analyze:
@@ -55,10 +55,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -85,15 +85,16 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Ensure correct JAVA version is installed.
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: '12.x'
+          distribution: 'zulu'
+          java-version: '17'
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -120,10 +121,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -150,10 +151,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -185,10 +186,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -224,10 +225,10 @@ jobs:
       - run: sudo apt-get install -y ninja-build libgtk-3-dev libblkid-dev
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -264,10 +265,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -292,10 +293,10 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -310,8 +311,8 @@ jobs:
         working-directory: ${{env.source-directory}}
 
       # Upload code coverage information
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3
         with:
-          file: ${{env.source-directory}}/coverage/lcov.info # optional
-          name: CacheManager # optional
-          fail_ci_if_error: true
\ No newline at end of file
+          files: ${{env.source-directory}}/coverage/lcov.info
+          name: CacheManager
+          fail_ci_if_error: true
diff --git a/flutter_cache_manager/.gitignore b/flutter_cache_manager/.gitignore
index 09941d42..24476c5d 100644
--- a/flutter_cache_manager/.gitignore
+++ b/flutter_cache_manager/.gitignore
@@ -1,6 +1,5 @@
 # Miscellaneous
 *.class
-*.lock
 *.log
 *.pyc
 *.swp
@@ -8,9 +7,8 @@
 .atom/
 .buildlog/
 .history
-.project
 .svn/
-bin/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -18,78 +16,29 @@ bin/
 *.iws
 .idea/
 
-# Android Studio related
-android/.classpath
-android/.settings/
-
-# Visual Studio Code related
-.vscode/
-
-# Flutter repo-specific
-/bin/cache/
-/bin/mingit/
-/dev/benchmarks/mega_gallery/
-/dev/bots/.recipe_deps
-/dev/bots/android_tools/
-/dev/docs/doc/
-/dev/docs/lib/
-/dev/docs/pubspec.yaml
-/packages/flutter/coverage/
-version
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
-build/
-flutter_*.png
-linked_*.ds
-unlinked.ds
-unlinked_spec.ds
-flutter_export_environment.sh
+/build/
 
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
+# Symbolication related
+app.*.symbols
 
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
+# Obfuscation related
+app.*.map.json
 
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-example/.flutter-plugins-dependencies
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/flutter_cache_manager/CHANGELOG.md b/flutter_cache_manager/CHANGELOG.md
index f6b26e89..ab3add4e 100644
--- a/flutter_cache_manager/CHANGELOG.md
+++ b/flutter_cache_manager/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [3.3.1] - TBD
+* Support Dart 3.0.0 for http ^1.0.0 and file ^7.0.0
+* Update example
+* Add topics
+
 ## [3.3.0] - 2021-11-29
 * Added option to manage the log level. Doesn't print failed downloads by default anymore. You can set it like this:
 ```dart
diff --git a/flutter_cache_manager/analysis_options.yaml b/flutter_cache_manager/analysis_options.yaml
index a3be6b82..f9b30346 100644
--- a/flutter_cache_manager/analysis_options.yaml
+++ b/flutter_cache_manager/analysis_options.yaml
@@ -1 +1 @@
-include: package:flutter_lints/flutter.yaml
\ No newline at end of file
+include: package:flutter_lints/flutter.yaml
diff --git a/flutter_cache_manager/example/.gitignore b/flutter_cache_manager/example/.gitignore
index 01f4ac79..24476c5d 100644
--- a/flutter_cache_manager/example/.gitignore
+++ b/flutter_cache_manager/example/.gitignore
@@ -1,6 +1,5 @@
 # Miscellaneous
 *.class
-*.lock
 *.log
 *.pyc
 *.swp
@@ -9,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -16,57 +16,29 @@
 *.iws
 .idea/
 
-# Visual Studio Code related
-.vscode/
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
-build/
+/build/
 
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
+# Symbolication related
+app.*.symbols
 
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
+# Obfuscation related
+app.*.map.json
 
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/flutter_cache_manager/example/README.md b/flutter_cache_manager/example/README.md
index 64a12f6b..75a7c517 100644
--- a/flutter_cache_manager/example/README.md
+++ b/flutter_cache_manager/example/README.md
@@ -1,8 +1 @@
-# example
-
-A new Flutter project.
-
-## Getting Started
-
-For help getting started with Flutter, view our online
-[documentation](https://flutter.io/).
+# A project that showcases usage of flutter_cache_manager
diff --git a/flutter_cache_manager/example/analysis_options.yaml b/flutter_cache_manager/example/analysis_options.yaml
index a3be6b82..f9b30346 100644
--- a/flutter_cache_manager/example/analysis_options.yaml
+++ b/flutter_cache_manager/example/analysis_options.yaml
@@ -1 +1 @@
-include: package:flutter_lints/flutter.yaml
\ No newline at end of file
+include: package:flutter_lints/flutter.yaml
diff --git a/flutter_cache_manager/example/android/app/build.gradle b/flutter_cache_manager/example/android/app/build.gradle
index b120248e..9192d00d 100644
--- a/flutter_cache_manager/example/android/app/build.gradle
+++ b/flutter_cache_manager/example/android/app/build.gradle
@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    namespace "com.baseflow.example"
+    compileSdkVersion 33
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -42,10 +44,9 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.example"
-        minSdkVersion 16
-        targetSdkVersion 30
+        applicationId "com.baseflow.example"
+        minSdkVersion 21
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/flutter_cache_manager/example/android/app/src/debug/AndroidManifest.xml b/flutter_cache_manager/example/android/app/src/debug/AndroidManifest.xml
index c208884f..399f6981 100644
--- a/flutter_cache_manager/example/android/app/src/debug/AndroidManifest.xml
+++ b/flutter_cache_manager/example/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.example">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/flutter_cache_manager/example/android/app/src/main/AndroidManifest.xml b/flutter_cache_manager/example/android/app/src/main/AndroidManifest.xml
index 34dd77ef..19b862ec 100644
--- a/flutter_cache_manager/example/android/app/src/main/AndroidManifest.xml
+++ b/flutter_cache_manager/example/android/app/src/main/AndroidManifest.xml
@@ -1,10 +1,11 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.example">
-   <application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
         android:label="example"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -18,15 +19,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/flutter_cache_manager/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/flutter_cache_manager/example/android/app/src/main/kotlin/com/baseflow/example/MainActivity.kt
similarity index 76%
rename from flutter_cache_manager/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt
rename to flutter_cache_manager/example/android/app/src/main/kotlin/com/baseflow/example/MainActivity.kt
index e793a000..1751a1f6 100644
--- a/flutter_cache_manager/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt
+++ b/flutter_cache_manager/example/android/app/src/main/kotlin/com/baseflow/example/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.example
+package com.baseflow.example
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/flutter_cache_manager/example/android/app/src/main/res/values-night/styles.xml b/flutter_cache_manager/example/android/app/src/main/res/values-night/styles.xml
index 449a9f93..06952be7 100644
--- a/flutter_cache_manager/example/android/app/src/main/res/values-night/styles.xml
+++ b/flutter_cache_manager/example/android/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/flutter_cache_manager/example/android/app/src/main/res/values/styles.xml b/flutter_cache_manager/example/android/app/src/main/res/values/styles.xml
index d74aa35c..cb1ef880 100644
--- a/flutter_cache_manager/example/android/app/src/main/res/values/styles.xml
+++ b/flutter_cache_manager/example/android/app/src/main/res/values/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/flutter_cache_manager/example/android/app/src/profile/AndroidManifest.xml b/flutter_cache_manager/example/android/app/src/profile/AndroidManifest.xml
index c208884f..399f6981 100644
--- a/flutter_cache_manager/example/android/app/src/profile/AndroidManifest.xml
+++ b/flutter_cache_manager/example/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.example">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/flutter_cache_manager/example/android/build.gradle b/flutter_cache_manager/example/android/build.gradle
index 09fbd640..ce647a43 100644
--- a/flutter_cache_manager/example/android/build.gradle
+++ b/flutter_cache_manager/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -21,9 +21,11 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/flutter_cache_manager/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_cache_manager/example/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58af..ceccc3a8 100644
--- a/flutter_cache_manager/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/flutter_cache_manager/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/flutter_cache_manager/example/ios/.gitignore b/flutter_cache_manager/example/ios/.gitignore
index e96ef602..7a7f9873 100644
--- a/flutter_cache_manager/example/ios/.gitignore
+++ b/flutter_cache_manager/example/ios/.gitignore
@@ -1,3 +1,4 @@
+**/dgph
 *.mode1v3
 *.mode2v3
 *.moved-aside
@@ -18,6 +19,7 @@ Flutter/App.framework
 Flutter/Flutter.framework
 Flutter/Flutter.podspec
 Flutter/Generated.xcconfig
+Flutter/ephemeral/
 Flutter/app.flx
 Flutter/app.zip
 Flutter/flutter_assets/
diff --git a/flutter_cache_manager/example/ios/Flutter/AppFrameworkInfo.plist b/flutter_cache_manager/example/ios/Flutter/AppFrameworkInfo.plist
index f2872cf4..9625e105 100644
--- a/flutter_cache_manager/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/flutter_cache_manager/example/ios/Flutter/AppFrameworkInfo.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>$(DEVELOPMENT_LANGUAGE)</string>
+  <string>en</string>
   <key>CFBundleExecutable</key>
   <string>App</string>
   <key>CFBundleIdentifier</key>
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/flutter_cache_manager/example/ios/Flutter/Debug.xcconfig b/flutter_cache_manager/example/ios/Flutter/Debug.xcconfig
index e8efba11..ec97fc6f 100644
--- a/flutter_cache_manager/example/ios/Flutter/Debug.xcconfig
+++ b/flutter_cache_manager/example/ios/Flutter/Debug.xcconfig
@@ -1,2 +1,2 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/flutter_cache_manager/example/ios/Flutter/Release.xcconfig b/flutter_cache_manager/example/ios/Flutter/Release.xcconfig
index 399e9340..c4855bfe 100644
--- a/flutter_cache_manager/example/ios/Flutter/Release.xcconfig
+++ b/flutter_cache_manager/example/ios/Flutter/Release.xcconfig
@@ -1,2 +1,2 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/flutter_cache_manager/example/ios/Podfile b/flutter_cache_manager/example/ios/Podfile
index 1e8c3c90..fdcc671e 100644
--- a/flutter_cache_manager/example/ios/Podfile
+++ b/flutter_cache_manager/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -32,6 +32,9 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|
diff --git a/flutter_cache_manager/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_cache_manager/example/ios/Runner.xcodeproj/project.pbxproj
index 843960ae..c75eb654 100644
--- a/flutter_cache_manager/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/flutter_cache_manager/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,19 +3,31 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		268D838023A33DFD9EFA3DF1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49EAA72595299BAFCD15C0A5 /* Pods_Runner.framework */; };
+		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		A89E80E5C66383851D85960C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7704FAAF0269F6CE42DFB4D6 /* Pods_Runner.framework */; };
+		F7BD10BFE0340F283E6E93AA /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A27122686E56836116819985 /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
+			remoteInfo = Runner;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -32,11 +44,16 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		16BF786E879B1D2534069BB6 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		1FFD3A151B2AE9CB0F79637E /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		28A91B98ACD307F50795CE63 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		2A5D500DD59C5ABD8BC320E9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		2BDBBCDC95EE9D699340FEB0 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		49EAA72595299BAFCD15C0A5 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		7704FAAF0269F6CE42DFB4D6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -45,39 +62,37 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B2B04C3D54887C3D3DFE450B /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		F20B7226528D89222602A717 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		A27122686E56836116819985 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		BFBE6121C722D36CAD68B894 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		E65907C93E9A58DEA8ECEC68 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		0356ECBC3811FC8EF96B797F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F7BD10BFE0340F283E6E93AA /* Pods_RunnerTests.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				268D838023A33DFD9EFA3DF1 /* Pods_Runner.framework in Frameworks */,
+				A89E80E5C66383851D85960C /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		30AF5C2097DB7541D0AE9DA0 /* Frameworks */ = {
+		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
-				49EAA72595299BAFCD15C0A5 /* Pods_Runner.framework */,
+				331C807B294A618700263BE5 /* RunnerTests.swift */,
 			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		955B97398EA4A8686CF703E5 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				F20B7226528D89222602A717 /* Pods-Runner.debug.xcconfig */,
-				16BF786E879B1D2534069BB6 /* Pods-Runner.release.xcconfig */,
-				B2B04C3D54887C3D3DFE450B /* Pods-Runner.profile.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
+			path = RunnerTests;
 			sourceTree = "<group>";
 		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
@@ -97,8 +112,9 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				955B97398EA4A8686CF703E5 /* Pods */,
-				30AF5C2097DB7541D0AE9DA0 /* Frameworks */,
+				331C8082294A63A400263BE5 /* RunnerTests */,
+				F70FE31A2C97E1C947ACFAE4 /* Pods */,
+				F197309FCBE2E2C735CA3658 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -106,6 +122,7 @@
 			isa = PBXGroup;
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
+				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -125,21 +142,63 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		F197309FCBE2E2C735CA3658 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7704FAAF0269F6CE42DFB4D6 /* Pods_Runner.framework */,
+				A27122686E56836116819985 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		F70FE31A2C97E1C947ACFAE4 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				1FFD3A151B2AE9CB0F79637E /* Pods-Runner.debug.xcconfig */,
+				2A5D500DD59C5ABD8BC320E9 /* Pods-Runner.release.xcconfig */,
+				28A91B98ACD307F50795CE63 /* Pods-Runner.profile.xcconfig */,
+				2BDBBCDC95EE9D699340FEB0 /* Pods-RunnerTests.debug.xcconfig */,
+				E65907C93E9A58DEA8ECEC68 /* Pods-RunnerTests.release.xcconfig */,
+				BFBE6121C722D36CAD68B894 /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		331C8080294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				A7C74AA6240117247B9AC070 /* [CP] Check Pods Manifest.lock */,
+				331C807D294A63A400263BE5 /* Sources */,
+				331C807F294A63A400263BE5 /* Resources */,
+				0356ECBC3811FC8EF96B797F /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C8086294A63A400263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				1C8292A93F6A7FE002973028 /* [CP] Check Pods Manifest.lock */,
+				62496165A00AB805F616810E /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				719C3F30B4A5356769DFC507 /* [CP] Embed Pods Frameworks */,
+				A9CBAD837CA4D9F4D3F704C5 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -156,9 +215,13 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
+					331C8080294A63A400263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 97C146ED1CF9000F007C117D;
+					};
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						LastSwiftMigration = 1100;
@@ -179,11 +242,19 @@
 			projectRoot = "";
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
+				331C8080294A63A400263BE5 /* RunnerTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		331C807F294A63A400263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EC1CF9000F007C117D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -198,7 +269,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1C8292A93F6A7FE002973028 /* [CP] Check Pods Manifest.lock */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
+		62496165A00AB805F616810E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -220,54 +307,71 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Thin Binary";
+			name = "Run Script";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		719C3F30B4A5356769DFC507 /* [CP] Embed Pods Frameworks */ = {
+		A7C74AA6240117247B9AC070 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		A9CBAD837CA4D9F4D3F704C5 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "Run Script";
-			outputPaths = (
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		331C807D294A63A400263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EA1CF9000F007C117D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -279,6 +383,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
+			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -340,7 +452,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -356,18 +468,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = NWAXZVJAA5;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -375,6 +483,56 @@
 			};
 			name = Profile;
 		};
+		331C8088294A63A400263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 2BDBBCDC95EE9D699340FEB0 /* Pods-RunnerTests.debug.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Debug;
+		};
+		331C8089294A63A400263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = E65907C93E9A58DEA8ECEC68 /* Pods-RunnerTests.release.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Release;
+		};
+		331C808A294A63A400263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = BFBE6121C722D36CAD68B894 /* Pods-RunnerTests.profile.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Profile;
+		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -422,7 +580,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -471,11 +629,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -488,18 +647,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = NWAXZVJAA5;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -515,18 +670,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = NWAXZVJAA5;
 				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -537,6 +688,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C8088294A63A400263BE5 /* Debug */,
+				331C8089294A63A400263BE5 /* Release */,
+				331C808A294A63A400263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/flutter_cache_manager/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_cache_manager/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a28140cf..e42adcb3 100644
--- a/flutter_cache_manager/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/flutter_cache_manager/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,19 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C8080294A63A400263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +70,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 28c6bf03..7353c41e 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 2ccbfd96..797d452e 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index f091b6b0..6ed2d933 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 4cde1211..4cd7b009 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index d0ef06e7..fe730945 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index dcdc2306..321773cd 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 2ccbfd96..797d452e 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index c8f9ed8f..502f463a 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index a6d6b860..0ec30343 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index a6d6b860..0ec30343 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 75b2d164..e9f5fea2 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index c4df70d3..84ac32ae 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 6a84f41e..8953cba0 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index d0e1f585..0467bf12 100644
Binary files a/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/flutter_cache_manager/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/flutter_cache_manager/example/ios/Runner/Info.plist b/flutter_cache_manager/example/ios/Runner/Info.plist
index a060db61..7f553465 100644
--- a/flutter_cache_manager/example/ios/Runner/Info.plist
+++ b/flutter_cache_manager/example/ios/Runner/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Example</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -41,5 +43,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/flutter_cache_manager/example/ios/RunnerTests/RunnerTests.swift b/flutter_cache_manager/example/ios/RunnerTests/RunnerTests.swift
new file mode 100644
index 00000000..86a7c3b1
--- /dev/null
+++ b/flutter_cache_manager/example/ios/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
diff --git a/flutter_cache_manager/example/lib/generated_plugin_registrant.dart b/flutter_cache_manager/example/lib/generated_plugin_registrant.dart
deleted file mode 100644
index 438d9d41..00000000
--- a/flutter_cache_manager/example/lib/generated_plugin_registrant.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Generated file. Do not edit.
-//
-
-// ignore_for_file: directives_ordering
-// ignore_for_file: lines_longer_than_80_chars
-
-import 'package:url_launcher_web/url_launcher_web.dart';
-
-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
-
-// ignore: public_member_api_docs
-void registerPlugins(Registrar registrar) {
-  UrlLauncherPlugin.registerWith(registrar);
-  registrar.registerMessageHandler();
-}
diff --git a/flutter_cache_manager/example/lib/main.dart b/flutter_cache_manager/example/lib/main.dart
index 05a7c185..081c9973 100644
--- a/flutter_cache_manager/example/lib/main.dart
+++ b/flutter_cache_manager/example/lib/main.dart
@@ -1,35 +1,38 @@
 import 'package:baseflow_plugin_template/baseflow_plugin_template.dart';
 import 'package:example/plugin_example/download_page.dart';
 import 'package:example/plugin_example/floating_action_button.dart';
+import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 void main() {
-  runApp(BaseflowPluginExample(
-    pluginName: 'Flutter Cache Manager',
-    githubURL: 'https://github.com/Baseflow/flutter_cache_manager',
-    pubDevURL: 'https://pub.dev/packages/flutter_cache_manager',
-    pages: [CacheManagerPage.createPage()],
-  ));
+  runApp(
+    BaseflowPluginExample(
+      pluginName: 'Flutter Cache Manager',
+      githubURL: 'https://github.com/Baseflow/flutter_cache_manager',
+      pubDevURL: 'https://pub.dev/packages/flutter_cache_manager',
+      pages: [CacheManagerPage.createPage()],
+    ),
+  );
   CacheManager.logLevel = CacheManagerLogLevel.verbose;
 }
 
-const url = 'https://blurha.sh/assets/images/img1.jpg';
+const url = 'https://picsum.photos/200/300';
 
 /// Example [Widget] showing the functionalities of flutter_cache_manager
 class CacheManagerPage extends StatefulWidget {
-  const CacheManagerPage({Key key}) : super(key: key);
+  const CacheManagerPage({super.key});
 
   static ExamplePage createPage() {
     return ExamplePage(Icons.save_alt, (context) => const CacheManagerPage());
   }
 
   @override
-  _CacheManagerPageState createState() => _CacheManagerPageState();
+  CacheManagerPageState createState() => CacheManagerPageState();
 }
 
-class _CacheManagerPageState extends State<CacheManagerPage> {
-  Stream<FileResponse> fileStream;
+class CacheManagerPageState extends State<CacheManagerPage> {
+  Stream<FileResponse>? fileStream;
 
   void _downloadFile() {
     setState(() {
@@ -41,16 +44,16 @@ class _CacheManagerPageState extends State<CacheManagerPage> {
   Widget build(BuildContext context) {
     if (fileStream == null) {
       return Scaffold(
-        appBar: null,
         body: const ListTile(
-            title: Text('Tap the floating action button to download.')),
+          title: Text('Tap the floating action button to download.'),
+        ),
         floatingActionButton: Fab(
           downloadFile: _downloadFile,
         ),
       );
     }
     return DownloadPage(
-      fileStream: fileStream,
+      fileStream: fileStream!,
       downloadFile: _downloadFile,
       clearCache: _clearCache,
       removeFile: _removeFile,
@@ -66,11 +69,13 @@ class _CacheManagerPageState extends State<CacheManagerPage> {
 
   void _removeFile() {
     DefaultCacheManager().removeFile(url).then((value) {
-      //ignore: avoid_print
-      print('File removed');
+      if (kDebugMode) {
+        print('File removed');
+      }
     }).onError((error, stackTrace) {
-      //ignore: avoid_print
-      print(error);
+      if (kDebugMode) {
+        print(error);
+      }
     });
     setState(() {
       fileStream = null;
diff --git a/flutter_cache_manager/example/lib/plugin_example/download_page.dart b/flutter_cache_manager/example/lib/plugin_example/download_page.dart
index 44d4b979..16645e3a 100644
--- a/flutter_cache_manager/example/lib/plugin_example/download_page.dart
+++ b/flutter_cache_manager/example/lib/plugin_example/download_page.dart
@@ -13,12 +13,12 @@ class DownloadPage extends StatelessWidget {
   final VoidCallback removeFile;
 
   const DownloadPage({
-    Key key,
-    this.fileStream,
-    this.downloadFile,
-    this.clearCache,
-    this.removeFile,
-  }) : super(key: key);
+    required this.fileStream,
+    required this.downloadFile,
+    required this.clearCache,
+    required this.removeFile,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -26,8 +26,7 @@ class DownloadPage extends StatelessWidget {
       stream: fileStream,
       builder: (context, snapshot) {
         Widget body;
-
-        var loading = !snapshot.hasData || snapshot.data is DownloadProgress;
+        final loading = !snapshot.hasData || snapshot.data is DownloadProgress;
 
         if (snapshot.hasError) {
           body = ListTile(
@@ -36,23 +35,20 @@ class DownloadPage extends StatelessWidget {
           );
         } else if (loading) {
           body = p_i.ProgressIndicator(
-              progress: snapshot.data as DownloadProgress);
+            progress: snapshot.data as DownloadProgress?,
+          );
         } else {
           body = FileInfoWidget(
-            fileInfo: snapshot.data as FileInfo,
+            fileInfo: snapshot.requireData as FileInfo,
             clearCache: clearCache,
             removeFile: removeFile,
           );
         }
 
         return Scaffold(
-          appBar: null,
           body: body,
-          floatingActionButton: !loading
-              ? Fab(
-                  downloadFile: downloadFile,
-                )
-              : null,
+          floatingActionButton:
+              !loading ? Fab(downloadFile: downloadFile) : null,
         );
       },
     );
diff --git a/flutter_cache_manager/example/lib/plugin_example/file_info_widget.dart b/flutter_cache_manager/example/lib/plugin_example/file_info_widget.dart
index bb39e1c7..77f63c18 100644
--- a/flutter_cache_manager/example/lib/plugin_example/file_info_widget.dart
+++ b/flutter_cache_manager/example/lib/plugin_example/file_info_widget.dart
@@ -8,25 +8,24 @@ class FileInfoWidget extends StatelessWidget {
   final VoidCallback removeFile;
 
   const FileInfoWidget({
-    Key key,
-    this.fileInfo,
-    this.clearCache,
-    this.removeFile,
-  }) : super(key: key);
+    required this.clearCache,
+    required this.removeFile,
+    required this.fileInfo,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
     return ListView(
-      children: <Widget>[
+      children: [
         ListTile(
           title: const Text('Original URL'),
           subtitle: Text(fileInfo.originalUrl),
         ),
-        if (fileInfo.file != null)
-          ListTile(
-            title: const Text('Local file path'),
-            subtitle: Text(fileInfo.file.path),
-          ),
+        ListTile(
+          title: const Text('Local file path'),
+          subtitle: Text(fileInfo.file.path),
+        ),
         ListTile(
           title: const Text('Loaded from'),
           subtitle: Text(fileInfo.source.toString()),
@@ -36,19 +35,17 @@ class FileInfoWidget extends StatelessWidget {
           subtitle: Text(fileInfo.validTill.toIso8601String()),
         ),
         Padding(
-          padding: const EdgeInsets.all(10.0),
-          // ignore: deprecated_member_use
-          child: RaisedButton(
-            child: const Text('CLEAR CACHE'),
+          padding: const EdgeInsets.all(10),
+          child: ElevatedButton(
             onPressed: clearCache,
+            child: const Text('CLEAR CACHE'),
           ),
         ),
         Padding(
-          padding: const EdgeInsets.all(10.0),
-          // ignore: deprecated_member_use
-          child: RaisedButton(
-            child: const Text('REMOVE FILE'),
+          padding: const EdgeInsets.all(10),
+          child: ElevatedButton(
             onPressed: removeFile,
+            child: const Text('REMOVE FILE'),
           ),
         ),
       ],
diff --git a/flutter_cache_manager/example/lib/plugin_example/floating_action_button.dart b/flutter_cache_manager/example/lib/plugin_example/floating_action_button.dart
index 890e5ec6..33ca5346 100644
--- a/flutter_cache_manager/example/lib/plugin_example/floating_action_button.dart
+++ b/flutter_cache_manager/example/lib/plugin_example/floating_action_button.dart
@@ -3,7 +3,11 @@ import 'package:flutter/material.dart';
 /// A [FloatingActionButton] used for downloading a file in [CacheManagerPage]
 class Fab extends StatelessWidget {
   final VoidCallback downloadFile;
-  const Fab({Key key, this.downloadFile}) : super(key: key);
+
+  const Fab({
+    required this.downloadFile,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/flutter_cache_manager/example/lib/plugin_example/progress_indicator.dart b/flutter_cache_manager/example/lib/plugin_example/progress_indicator.dart
index bc0acd4b..549ff670 100644
--- a/flutter_cache_manager/example/lib/plugin_example/progress_indicator.dart
+++ b/flutter_cache_manager/example/lib/plugin_example/progress_indicator.dart
@@ -4,24 +4,24 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 /// A centered and sized [CircularProgressIndicator] to show download progress
 /// in the [DownloadPage].
 class ProgressIndicator extends StatelessWidget {
-  final DownloadProgress progress;
+  final DownloadProgress? progress;
 
-  const ProgressIndicator({Key key, this.progress}) : super(key: key);
+  const ProgressIndicator({super.key, this.progress});
 
   @override
   Widget build(BuildContext context) {
     return Center(
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
-        children: <Widget>[
+        children: [
           SizedBox(
-            width: 50.0,
-            height: 50.0,
-            child: CircularProgressIndicator(
+            width: 50,
+            height: 50,
+            child: CircularProgressIndicator.adaptive(
               value: progress?.progress,
             ),
           ),
-          const SizedBox(width: 20.0),
+          const SizedBox(width: 20),
           const Text('Downloading'),
         ],
       ),
diff --git a/flutter_cache_manager/example/linux/CMakeLists.txt b/flutter_cache_manager/example/linux/CMakeLists.txt
index 290c3e84..be8ea20c 100644
--- a/flutter_cache_manager/example/linux/CMakeLists.txt
+++ b/flutter_cache_manager/example/linux/CMakeLists.txt
@@ -1,14 +1,32 @@
+# Project-level configuration.
 cmake_minimum_required(VERSION 3.10)
 project(runner LANGUAGES CXX)
 
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
 set(BINARY_NAME "example")
-set(APPLICATION_ID "com.example.example")
+# The unique GTK application identifier for this application. See:
+# https://wiki.gnome.org/HowDoI/ChooseApplicationID
+set(APPLICATION_ID "com.baseflow.example")
 
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
 cmake_policy(SET CMP0063 NEW)
 
+# Load bundled libraries from the lib/ directory relative to the binary.
 set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
 
-# Configure build options.
+# Root filesystem for cross-building.
+if(FLUTTER_TARGET_PLATFORM_SYSROOT)
+  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+# Define build configuration options.
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_BUILD_TYPE "Debug" CACHE
     STRING "Flutter build mode" FORCE)
@@ -17,6 +35,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
 function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_features(${TARGET} PUBLIC cxx_std_14)
   target_compile_options(${TARGET} PRIVATE -Wall -Werror)
@@ -24,9 +46,8 @@ function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
 endfunction()
 
-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-
 # Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
 add_subdirectory(${FLUTTER_MANAGED_DIR})
 
 # System-level dependencies.
@@ -35,16 +56,27 @@ pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
 
 add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
 
-# Application build
+# Define the application target. To change its name, change BINARY_NAME above,
+# not the value here, or `flutter run` will no longer work.
+#
+# Any new source files that you add to the application should be added here.
 add_executable(${BINARY_NAME}
   "main.cc"
   "my_application.cc"
   "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
 )
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
 apply_standard_settings(${BINARY_NAME})
+
+# Add dependency libraries. Add any application-specific dependencies here.
 target_link_libraries(${BINARY_NAME} PRIVATE flutter)
 target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+
+# Run the Flutter tool portions of the build. This must not be removed.
 add_dependencies(${BINARY_NAME} flutter_assemble)
+
 # Only the install-generated bundle's copy of the executable will launch
 # correctly, since the resources must in the right relative locations. To avoid
 # people trying to run the unbundled copy, put it in a subdirectory instead of
@@ -54,6 +86,7 @@ set_target_properties(${BINARY_NAME}
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
 )
 
+
 # Generated plugin build rules, which manage building the plugins and adding
 # them to the application.
 include(flutter/generated_plugins.cmake)
@@ -84,11 +117,11 @@ install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}
 install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
   COMPONENT Runtime)
 
-if(PLUGIN_BUNDLED_LIBRARIES)
-  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
+foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
+  install(FILES "${bundled_library}"
     DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
     COMPONENT Runtime)
-endif()
+endforeach(bundled_library)
 
 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
diff --git a/flutter_cache_manager/example/linux/flutter/CMakeLists.txt b/flutter_cache_manager/example/linux/flutter/CMakeLists.txt
index 4f48a7ce..d5bd0164 100644
--- a/flutter_cache_manager/example/linux/flutter/CMakeLists.txt
+++ b/flutter_cache_manager/example/linux/flutter/CMakeLists.txt
@@ -1,3 +1,4 @@
+# This file controls Flutter-level build steps. It should not be edited.
 cmake_minimum_required(VERSION 3.10)
 
 set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
@@ -24,7 +25,6 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
 pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
 pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
-pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid)
 
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
 
@@ -66,7 +66,6 @@ target_link_libraries(flutter INTERFACE
   PkgConfig::GTK
   PkgConfig::GLIB
   PkgConfig::GIO
-  PkgConfig::BLKID
 )
 add_dependencies(flutter flutter_assemble)
 
@@ -80,7 +79,8 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
-      linux-x64 ${CMAKE_BUILD_TYPE}
+      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
+  VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS
   "${FLUTTER_LIBRARY}"
diff --git a/flutter_cache_manager/example/linux/flutter/generated_plugins.cmake b/flutter_cache_manager/example/linux/flutter/generated_plugins.cmake
index 1fc8ed34..f16b4c34 100644
--- a/flutter_cache_manager/example/linux/flutter/generated_plugins.cmake
+++ b/flutter_cache_manager/example/linux/flutter/generated_plugins.cmake
@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_linux
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/flutter_cache_manager/example/linux/main.cc b/flutter_cache_manager/example/linux/main.cc
index 058e6178..e7c5c543 100644
--- a/flutter_cache_manager/example/linux/main.cc
+++ b/flutter_cache_manager/example/linux/main.cc
@@ -1,10 +1,6 @@
 #include "my_application.h"
 
 int main(int argc, char** argv) {
-  // Only X11 is currently supported.
-  // Wayland support is being developed: https://github.com/flutter/flutter/issues/57932.
-  gdk_set_allowed_backends("x11");
-
   g_autoptr(MyApplication) app = my_application_new();
   return g_application_run(G_APPLICATION(app), argc, argv);
 }
diff --git a/flutter_cache_manager/example/linux/my_application.cc b/flutter_cache_manager/example/linux/my_application.cc
index f28ca309..0ba8f430 100644
--- a/flutter_cache_manager/example/linux/my_application.cc
+++ b/flutter_cache_manager/example/linux/my_application.cc
@@ -1,28 +1,57 @@
 #include "my_application.h"
 
 #include <flutter_linux/flutter_linux.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
 
 #include "flutter/generated_plugin_registrant.h"
 
 struct _MyApplication {
   GtkApplication parent_instance;
+  char** dart_entrypoint_arguments;
 };
 
 G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
 
 // Implements GApplication::activate.
 static void my_application_activate(GApplication* application) {
+  MyApplication* self = MY_APPLICATION(application);
   GtkWindow* window =
       GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
-  GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
-  gtk_widget_show(GTK_WIDGET(header_bar));
-  gtk_header_bar_set_title(header_bar, "example");
-  gtk_header_bar_set_show_close_button(header_bar, TRUE);
-  gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
+
+  // Use a header bar when running in GNOME as this is the common style used
+  // by applications and is the setup most users will be using (e.g. Ubuntu
+  // desktop).
+  // If running on X and not using GNOME then just use a traditional title bar
+  // in case the window manager does more exotic layout, e.g. tiling.
+  // If running on Wayland assume the header bar will work (may need changing
+  // if future cases occur).
+  gboolean use_header_bar = TRUE;
+#ifdef GDK_WINDOWING_X11
+  GdkScreen* screen = gtk_window_get_screen(window);
+  if (GDK_IS_X11_SCREEN(screen)) {
+    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
+    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
+      use_header_bar = FALSE;
+    }
+  }
+#endif
+  if (use_header_bar) {
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+    gtk_widget_show(GTK_WIDGET(header_bar));
+    gtk_header_bar_set_title(header_bar, "example");
+    gtk_header_bar_set_show_close_button(header_bar, TRUE);
+    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
+  } else {
+    gtk_window_set_title(window, "example");
+  }
+
   gtk_window_set_default_size(window, 1280, 720);
   gtk_widget_show(GTK_WIDGET(window));
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
+  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
 
   FlView* view = fl_view_new(project);
   gtk_widget_show(GTK_WIDGET(view));
@@ -33,8 +62,36 @@ static void my_application_activate(GApplication* application) {
   gtk_widget_grab_focus(GTK_WIDGET(view));
 }
 
+// Implements GApplication::local_command_line.
+static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+  MyApplication* self = MY_APPLICATION(application);
+  // Strip out the first argument as it is the binary name.
+  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
+
+  g_autoptr(GError) error = nullptr;
+  if (!g_application_register(application, nullptr, &error)) {
+     g_warning("Failed to register: %s", error->message);
+     *exit_status = 1;
+     return TRUE;
+  }
+
+  g_application_activate(application);
+  *exit_status = 0;
+
+  return TRUE;
+}
+
+// Implements GObject::dispose.
+static void my_application_dispose(GObject* object) {
+  MyApplication* self = MY_APPLICATION(object);
+  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
+  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
+}
+
 static void my_application_class_init(MyApplicationClass* klass) {
   G_APPLICATION_CLASS(klass)->activate = my_application_activate;
+  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
 }
 
 static void my_application_init(MyApplication* self) {}
@@ -42,5 +99,6 @@ static void my_application_init(MyApplication* self) {}
 MyApplication* my_application_new() {
   return MY_APPLICATION(g_object_new(my_application_get_type(),
                                      "application-id", APPLICATION_ID,
+                                     "flags", G_APPLICATION_NON_UNIQUE,
                                      nullptr));
 }
diff --git a/flutter_cache_manager/example/macos/Flutter/GeneratedPluginRegistrant.swift b/flutter_cache_manager/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 63307a96..d24127f3 100644
--- a/flutter_cache_manager/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/flutter_cache_manager/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,7 +5,7 @@
 import FlutterMacOS
 import Foundation
 
-import path_provider_macos
+import path_provider_foundation
 import sqflite
 import url_launcher_macos
 
diff --git a/flutter_cache_manager/example/macos/Podfile b/flutter_cache_manager/example/macos/Podfile
index dade8dfa..c795730d 100644
--- a/flutter_cache_manager/example/macos/Podfile
+++ b/flutter_cache_manager/example/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.11'
+platform :osx, '10.14'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -31,6 +31,9 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|
diff --git a/flutter_cache_manager/example/macos/Runner.xcodeproj/project.pbxproj b/flutter_cache_manager/example/macos/Runner.xcodeproj/project.pbxproj
index 0e0edd23..41d3694e 100644
--- a/flutter_cache_manager/example/macos/Runner.xcodeproj/project.pbxproj
+++ b/flutter_cache_manager/example/macos/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -21,15 +21,24 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		1F2A8C32C34D1F848B4166E7 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 821239AD94857408D56C4D54 /* Pods_Runner.framework */; };
+		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
 		33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; };
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+		D5B01A320121EDFB3C6E5ACE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC57B9A51BACFF27C67AB72D /* Pods_Runner.framework */; };
+		ED974FA40384DB36751215A8 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE2C8A8FDAE0A7FDAB1E4DBD /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 33CC10EC2044A3C60003C045;
+			remoteInfo = Runner;
+		};
 		33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 33CC10E52044A3C60003C045 /* Project object */;
@@ -53,6 +62,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0F691A0E4B4C9F59E57294BC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		28DB72531F61FBC40F3CEDAA /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		33CC10ED2044A3C60003C045 /* example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -67,26 +80,44 @@
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
-		7A6118A090909EE7E781587C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		42144AD4456D168DBD9EA36B /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		421819CD2EE32280AEA755EC /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
-		821239AD94857408D56C4D54 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		93A7BACDD2C275594DEA078E /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		B869E254DE4413EAA8964DD9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		BAD57FC1C963D684F07ED177 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
+		CC57B9A51BACFF27C67AB72D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		DE2C8A8FDAE0A7FDAB1E4DBD /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		FF9DC3FB6BB66E62F5038DE0 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		331C80D2294CF70F00263BE5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				ED974FA40384DB36751215A8 /* Pods_RunnerTests.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		33CC10EA2044A3C60003C045 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1F2A8C32C34D1F848B4166E7 /* Pods_Runner.framework in Frameworks */,
+				D5B01A320121EDFB3C6E5ACE /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		331C80D6294CF71000263BE5 /* RunnerTests */ = {
+			isa = PBXGroup;
+			children = (
+				331C80D7294CF71000263BE5 /* RunnerTests.swift */,
+			);
+			path = RunnerTests;
+			sourceTree = "<group>";
+		};
 		33BA886A226E78AF003329D5 /* Configs */ = {
 			isa = PBXGroup;
 			children = (
@@ -103,9 +134,10 @@
 			children = (
 				33FAB671232836740065AC1E /* Runner */,
 				33CEB47122A05771004F2AC0 /* Flutter */,
+				331C80D6294CF71000263BE5 /* RunnerTests */,
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
-				C3360EAFF68600D7386F5DCF /* Pods */,
+				82766BBE125D5C25EDDF556B /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -113,6 +145,7 @@
 			isa = PBXGroup;
 			children = (
 				33CC10ED2044A3C60003C045 /* example.app */,
+				331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -152,12 +185,15 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		C3360EAFF68600D7386F5DCF /* Pods */ = {
+		82766BBE125D5C25EDDF556B /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				93A7BACDD2C275594DEA078E /* Pods-Runner.debug.xcconfig */,
-				B869E254DE4413EAA8964DD9 /* Pods-Runner.release.xcconfig */,
-				7A6118A090909EE7E781587C /* Pods-Runner.profile.xcconfig */,
+				FF9DC3FB6BB66E62F5038DE0 /* Pods-Runner.debug.xcconfig */,
+				421819CD2EE32280AEA755EC /* Pods-Runner.release.xcconfig */,
+				0F691A0E4B4C9F59E57294BC /* Pods-Runner.profile.xcconfig */,
+				42144AD4456D168DBD9EA36B /* Pods-RunnerTests.debug.xcconfig */,
+				BAD57FC1C963D684F07ED177 /* Pods-RunnerTests.release.xcconfig */,
+				28DB72531F61FBC40F3CEDAA /* Pods-RunnerTests.profile.xcconfig */,
 			);
 			name = Pods;
 			path = Pods;
@@ -166,7 +202,8 @@
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				821239AD94857408D56C4D54 /* Pods_Runner.framework */,
+				CC57B9A51BACFF27C67AB72D /* Pods_Runner.framework */,
+				DE2C8A8FDAE0A7FDAB1E4DBD /* Pods_RunnerTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -174,17 +211,36 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		331C80D4294CF70F00263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				D3A74C11E776FE7C8B976997 /* [CP] Check Pods Manifest.lock */,
+				331C80D1294CF70F00263BE5 /* Sources */,
+				331C80D2294CF70F00263BE5 /* Frameworks */,
+				331C80D3294CF70F00263BE5 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C80DA294CF71000263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		33CC10EC2044A3C60003C045 /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				ABEA4FFB57AC0E492C9C2D57 /* [CP] Check Pods Manifest.lock */,
+				1F2AC582A47D8424DC730A99 /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				44A5FFB3BA9C7FFA37E363FB /* [CP] Embed Pods Frameworks */,
+				D383C0B9CE6563DCF1551308 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -203,9 +259,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
+					331C80D4294CF70F00263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 33CC10EC2044A3C60003C045;
+					};
 					33CC10EC2044A3C60003C045 = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 1100;
@@ -236,12 +296,20 @@
 			projectRoot = "";
 			targets = (
 				33CC10EC2044A3C60003C045 /* Runner */,
+				331C80D4294CF70F00263BE5 /* RunnerTests */,
 				33CC111A2044C6BA0003C045 /* Flutter Assemble */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		331C80D3294CF70F00263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		33CC10EB2044A3C60003C045 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -254,8 +322,31 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		1F2AC582A47D8424DC730A99 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3399D490228B24CF009A79C7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -291,7 +382,7 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
-		44A5FFB3BA9C7FFA37E363FB /* [CP] Embed Pods Frameworks */ = {
+		D383C0B9CE6563DCF1551308 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -308,7 +399,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		ABEA4FFB57AC0E492C9C2D57 /* [CP] Check Pods Manifest.lock */ = {
+		D3A74C11E776FE7C8B976997 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -323,7 +414,7 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -333,6 +424,14 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		331C80D1294CF70F00263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		33CC10E92044A3C60003C045 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -346,6 +445,11 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		331C80DA294CF71000263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 33CC10EC2044A3C60003C045 /* Runner */;
+			targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */;
+		};
 		33CC11202044C79F0003C045 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */;
@@ -366,6 +470,51 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		331C80DB294CF71000263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 42144AD4456D168DBD9EA36B /* Pods-RunnerTests.debug.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/example";
+			};
+			name = Debug;
+		};
+		331C80DC294CF71000263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = BAD57FC1C963D684F07ED177 /* Pods-RunnerTests.release.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/example";
+			};
+			name = Release;
+		};
+		331C80DD294CF71000263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 28DB72531F61FBC40F3CEDAA /* Pods-RunnerTests.profile.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/example";
+			};
+			name = Profile;
+		};
 		338D0CE9231458BD00FA5F75 /* Profile */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
@@ -404,7 +553,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -483,7 +632,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -530,7 +679,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -596,6 +745,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C80DB294CF71000263BE5 /* Debug */,
+				331C80DC294CF71000263BE5 /* Release */,
+				331C80DD294CF71000263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/flutter_cache_manager/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_cache_manager/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index ae8ff59d..8fedab68 100644
--- a/flutter_cache_manager/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/flutter_cache_manager/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -36,8 +36,19 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C80D4294CF70F00263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -59,8 +70,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
diff --git a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
index 3c4935a7..82b6f9d9 100644
Binary files a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ
diff --git a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
index ed4cc164..13b35eba 100644
Binary files a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ
diff --git a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
index 483be613..0a3f5fa4 100644
Binary files a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ
diff --git a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
index bcbf36df..bdb57226 100644
Binary files a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ
diff --git a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
index 9c0a6528..f083318e 100644
Binary files a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ
diff --git a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
index e71a7261..326c0e72 100644
Binary files a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ
diff --git a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
index 8a31fe2d..2f1632cf 100644
Binary files a/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/flutter_cache_manager/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ
diff --git a/flutter_cache_manager/example/macos/Runner/Base.lproj/MainMenu.xib b/flutter_cache_manager/example/macos/Runner/Base.lproj/MainMenu.xib
index 537341ab..80e867a4 100644
--- a/flutter_cache_manager/example/macos/Runner/Base.lproj/MainMenu.xib
+++ b/flutter_cache_manager/example/macos/Runner/Base.lproj/MainMenu.xib
@@ -323,6 +323,10 @@
                         </items>
                     </menu>
                 </menuItem>
+                <menuItem title="Help" id="EPT-qC-fAb">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Help" systemMenu="help" id="rJ0-wn-3NY"/>
+                </menuItem>
             </items>
             <point key="canvasLocation" x="142" y="-258"/>
         </menu>
diff --git a/flutter_cache_manager/example/macos/Runner/Configs/AppInfo.xcconfig b/flutter_cache_manager/example/macos/Runner/Configs/AppInfo.xcconfig
index cf9be60c..8705ced4 100644
--- a/flutter_cache_manager/example/macos/Runner/Configs/AppInfo.xcconfig
+++ b/flutter_cache_manager/example/macos/Runner/Configs/AppInfo.xcconfig
@@ -8,7 +8,7 @@
 PRODUCT_NAME = example
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.example
+PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.example
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2021 com.example. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2023 com.baseflow. All rights reserved.
diff --git a/flutter_cache_manager/example/macos/Runner/MainFlutterWindow.swift b/flutter_cache_manager/example/macos/Runner/MainFlutterWindow.swift
index 2722837e..3cc05eb2 100644
--- a/flutter_cache_manager/example/macos/Runner/MainFlutterWindow.swift
+++ b/flutter_cache_manager/example/macos/Runner/MainFlutterWindow.swift
@@ -3,7 +3,7 @@ import FlutterMacOS
 
 class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
-    let flutterViewController = FlutterViewController.init()
+    let flutterViewController = FlutterViewController()
     let windowFrame = self.frame
     self.contentViewController = flutterViewController
     self.setFrame(windowFrame, display: true)
diff --git a/flutter_cache_manager/example/macos/RunnerTests/RunnerTests.swift b/flutter_cache_manager/example/macos/RunnerTests/RunnerTests.swift
new file mode 100644
index 00000000..5418c9f5
--- /dev/null
+++ b/flutter_cache_manager/example/macos/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import FlutterMacOS
+import Cocoa
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
diff --git a/flutter_cache_manager/example/pubspec.yaml b/flutter_cache_manager/example/pubspec.yaml
index 8c9a61dc..acace8eb 100644
--- a/flutter_cache_manager/example/pubspec.yaml
+++ b/flutter_cache_manager/example/pubspec.yaml
@@ -1,34 +1,23 @@
 name: example
-description: A new Flutter project.
+description: A project that showcases usage of flutter_cache_manager
 publish_to: none
-
 version: 1.0.0+1
-
 environment:
-  sdk: ">=2.10.2 <3.0.0"
+  sdk: '>=2.17.0 <4.0.0'
 
 dependencies:
-  baseflow_plugin_template:
-    git:
-      url: https://github.com/Baseflow/baseflow_plugin_template.git
-      ref: v1.0.0
-  cupertino_icons: ^1.0.2
+  baseflow_plugin_template: ^2.1.2
+  cupertino_icons: ^1.0.5
   flutter:
     sdk: flutter
   flutter_cache_manager:
     path: ../
-  url_launcher: ^5.4.11
+  url_launcher: ^6.1.10
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.4
+  flutter_lints: ^2.0.1
 
-
-# The following section is specific to Flutter.
 flutter:
   uses-material-design: true
-
-  assets:
-    - packages/baseflow_plugin_template/logo.png
-    - packages/baseflow_plugin_template/poweredByBaseflow.png
diff --git a/flutter_cache_manager/example/res/images/baseflow_logo_def_light-02.png b/flutter_cache_manager/example/res/images/baseflow_logo_def_light-02.png
deleted file mode 100644
index 85f071f2..00000000
Binary files a/flutter_cache_manager/example/res/images/baseflow_logo_def_light-02.png and /dev/null differ
diff --git a/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight.png b/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight.png
deleted file mode 100644
index 6b9f1aae..00000000
Binary files a/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight.png and /dev/null differ
diff --git a/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight@2x.png b/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight@2x.png
deleted file mode 100644
index 66901d9e..00000000
Binary files a/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight@2x.png and /dev/null differ
diff --git a/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight@3x.png b/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight@3x.png
deleted file mode 100644
index 36fbdff3..00000000
Binary files a/flutter_cache_manager/example/res/images/poweredByBaseflowLogoLight@3x.png and /dev/null differ
diff --git a/flutter_cache_manager/example/web/index.html b/flutter_cache_manager/example/web/index.html
index 9b7a438f..8be2c326 100644
--- a/flutter_cache_manager/example/web/index.html
+++ b/flutter_cache_manager/example/web/index.html
@@ -1,9 +1,24 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="A new Flutter project.">
+  <meta name="description" content="A project that showcases usage of flutter_cache_manager">
 
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
@@ -12,22 +27,33 @@
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
-  <link rel="shortcut icon" type="image/png" href="favicon.png"/>
+  <link rel="icon" type="image/png" href="favicon.png"/>
 
   <title>example</title>
   <link rel="manifest" href="manifest.json">
+
+  <script>
+    // The value below is injected by flutter build, do not touch.
+    var serviceWorkerVersion = null;
+  </script>
+  <!-- This script adds the flutter initialization JS code -->
+  <script src="flutter.js" defer></script>
 </head>
 <body>
-  <!-- This script installs service_worker.js to provide PWA functionality to
-       application. For more information, see:
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
   <script>
-    if ('serviceWorker' in navigator) {
-      window.addEventListener('load', function () {
-        navigator.serviceWorker.register('flutter_service_worker.js');
+    window.addEventListener('load', function(ev) {
+      // Download main.dart.js
+      _flutter.loader.loadEntrypoint({
+        serviceWorker: {
+          serviceWorkerVersion: serviceWorkerVersion,
+        },
+        onEntrypointLoaded: function(engineInitializer) {
+          engineInitializer.initializeEngine().then(function(appRunner) {
+            appRunner.runApp();
+          });
+        }
       });
-    }
+    });
   </script>
-  <script src="main.dart.js" type="application/javascript"></script>
 </body>
 </html>
diff --git a/flutter_cache_manager/example/web/manifest.json b/flutter_cache_manager/example/web/manifest.json
index 8c012917..94c8eb03 100644
--- a/flutter_cache_manager/example/web/manifest.json
+++ b/flutter_cache_manager/example/web/manifest.json
@@ -5,7 +5,7 @@
     "display": "standalone",
     "background_color": "#0175C2",
     "theme_color": "#0175C2",
-    "description": "A new Flutter project.",
+    "description": "A project that showcases usage of flutter_cache_manager",
     "orientation": "portrait-primary",
     "prefer_related_applications": false,
     "icons": [
@@ -18,6 +18,18 @@
             "src": "icons/Icon-512.png",
             "sizes": "512x512",
             "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
         }
     ]
 }
diff --git a/flutter_cache_manager/example/windows/CMakeLists.txt b/flutter_cache_manager/example/windows/CMakeLists.txt
index abf90408..13786727 100644
--- a/flutter_cache_manager/example/windows/CMakeLists.txt
+++ b/flutter_cache_manager/example/windows/CMakeLists.txt
@@ -1,13 +1,16 @@
-cmake_minimum_required(VERSION 3.15)
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.14)
 project(example LANGUAGES CXX)
 
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
 set(BINARY_NAME "example")
 
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
 cmake_policy(SET CMP0063 NEW)
 
-set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
-
-# Configure build options.
+# Define build configuration option.
 get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(IS_MULTICONFIG)
   set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
@@ -20,7 +23,7 @@ else()
       "Debug" "Profile" "Release")
   endif()
 endif()
-
+# Define settings for the Profile build mode.
 set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
 set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
 set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}")
@@ -30,6 +33,10 @@ set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}")
 add_definitions(-DUNICODE -D_UNICODE)
 
 # Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
 function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_features(${TARGET} PUBLIC cxx_std_17)
   target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100")
@@ -38,14 +45,14 @@ function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>")
 endfunction()
 
-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-
 # Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
 add_subdirectory(${FLUTTER_MANAGED_DIR})
 
-# Application build
+# Application build; see runner/CMakeLists.txt.
 add_subdirectory("runner")
 
+
 # Generated plugin build rules, which manage building the plugins and adding
 # them to the application.
 include(flutter/generated_plugins.cmake)
diff --git a/flutter_cache_manager/example/windows/flutter/CMakeLists.txt b/flutter_cache_manager/example/windows/flutter/CMakeLists.txt
index c7a8c760..930d2071 100644
--- a/flutter_cache_manager/example/windows/flutter/CMakeLists.txt
+++ b/flutter_cache_manager/example/windows/flutter/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.15)
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.14)
 
 set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
 
@@ -23,6 +24,7 @@ list(APPEND FLUTTER_LIBRARY_HEADERS
   "flutter_windows.h"
   "flutter_messenger.h"
   "flutter_plugin_registrar.h"
+  "flutter_texture_registrar.h"
 )
 list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/")
 add_library(flutter INTERFACE)
@@ -91,6 +93,7 @@ add_custom_command(
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
       windows-x64 $<CONFIG>
+  VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS
   "${FLUTTER_LIBRARY}"
diff --git a/flutter_cache_manager/example/windows/flutter/generated_plugin_registrant.cc b/flutter_cache_manager/example/windows/flutter/generated_plugin_registrant.cc
index d9fdd539..4f788487 100644
--- a/flutter_cache_manager/example/windows/flutter/generated_plugin_registrant.cc
+++ b/flutter_cache_manager/example/windows/flutter/generated_plugin_registrant.cc
@@ -6,9 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <url_launcher_windows/url_launcher_plugin.h>
+#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  UrlLauncherPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("UrlLauncherPlugin"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }
diff --git a/flutter_cache_manager/example/windows/flutter/generated_plugins.cmake b/flutter_cache_manager/example/windows/flutter/generated_plugins.cmake
index 411af46d..88b22e5c 100644
--- a/flutter_cache_manager/example/windows/flutter/generated_plugins.cmake
+++ b/flutter_cache_manager/example/windows/flutter/generated_plugins.cmake
@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_windows
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/flutter_cache_manager/example/windows/runner/CMakeLists.txt b/flutter_cache_manager/example/windows/runner/CMakeLists.txt
index 977e38b5..394917c0 100644
--- a/flutter_cache_manager/example/windows/runner/CMakeLists.txt
+++ b/flutter_cache_manager/example/windows/runner/CMakeLists.txt
@@ -1,18 +1,40 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.14)
 project(runner LANGUAGES CXX)
 
+# Define the application target. To change its name, change BINARY_NAME in the
+# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
+# work.
+#
+# Any new source files that you add to the application should be added here.
 add_executable(${BINARY_NAME} WIN32
   "flutter_window.cpp"
   "main.cpp"
-  "run_loop.cpp"
   "utils.cpp"
   "win32_window.cpp"
   "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
   "Runner.rc"
   "runner.exe.manifest"
 )
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
 apply_standard_settings(${BINARY_NAME})
+
+# Add preprocessor definitions for the build version.
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
+
+# Disable Windows macros that collide with C++ standard library functions.
 target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
+
+# Add dependency libraries and include directories. Add any application-specific
+# dependencies here.
 target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
+target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
 target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
+
+# Run the Flutter tool portions of the build. This must not be removed.
 add_dependencies(${BINARY_NAME} flutter_assemble)
diff --git a/flutter_cache_manager/example/windows/runner/Runner.rc b/flutter_cache_manager/example/windows/runner/Runner.rc
index 944329af..bae43fce 100644
--- a/flutter_cache_manager/example/windows/runner/Runner.rc
+++ b/flutter_cache_manager/example/windows/runner/Runner.rc
@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif
@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "com.example" "\0"
-            VALUE "FileDescription", "A new Flutter project." "\0"
+            VALUE "CompanyName", "com.baseflow" "\0"
+            VALUE "FileDescription", "example" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "example" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2020 com.example. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2023 com.baseflow. All rights reserved." "\0"
             VALUE "OriginalFilename", "example.exe" "\0"
             VALUE "ProductName", "example" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
diff --git a/flutter_cache_manager/example/windows/runner/flutter_window.cpp b/flutter_cache_manager/example/windows/runner/flutter_window.cpp
index c4227230..b25e363e 100644
--- a/flutter_cache_manager/example/windows/runner/flutter_window.cpp
+++ b/flutter_cache_manager/example/windows/runner/flutter_window.cpp
@@ -4,9 +4,8 @@
 
 #include "flutter/generated_plugin_registrant.h"
 
-FlutterWindow::FlutterWindow(RunLoop* run_loop,
-                             const flutter::DartProject& project)
-    : run_loop_(run_loop), project_(project) {}
+FlutterWindow::FlutterWindow(const flutter::DartProject& project)
+    : project_(project) {}
 
 FlutterWindow::~FlutterWindow() {}
 
@@ -26,14 +25,17 @@ bool FlutterWindow::OnCreate() {
     return false;
   }
   RegisterPlugins(flutter_controller_->engine());
-  run_loop_->RegisterFlutterInstance(flutter_controller_->engine());
   SetChildContent(flutter_controller_->view()->GetNativeWindow());
+
+  flutter_controller_->engine()->SetNextFrameCallback([&]() {
+    this->Show();
+  });
+
   return true;
 }
 
 void FlutterWindow::OnDestroy() {
   if (flutter_controller_) {
-    run_loop_->UnregisterFlutterInstance(flutter_controller_->engine());
     flutter_controller_ = nullptr;
   }
 
@@ -44,7 +46,7 @@ LRESULT
 FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
                               WPARAM const wparam,
                               LPARAM const lparam) noexcept {
-  // Give Flutter, including plugins, an opporutunity to handle window messages.
+  // Give Flutter, including plugins, an opportunity to handle window messages.
   if (flutter_controller_) {
     std::optional<LRESULT> result =
         flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
diff --git a/flutter_cache_manager/example/windows/runner/flutter_window.h b/flutter_cache_manager/example/windows/runner/flutter_window.h
index b663ddd5..6da0652f 100644
--- a/flutter_cache_manager/example/windows/runner/flutter_window.h
+++ b/flutter_cache_manager/example/windows/runner/flutter_window.h
@@ -6,16 +6,13 @@
 
 #include <memory>
 
-#include "run_loop.h"
 #include "win32_window.h"
 
 // A window that does nothing but host a Flutter view.
 class FlutterWindow : public Win32Window {
  public:
-  // Creates a new FlutterWindow driven by the |run_loop|, hosting a
-  // Flutter view running |project|.
-  explicit FlutterWindow(RunLoop* run_loop,
-                         const flutter::DartProject& project);
+  // Creates a new FlutterWindow hosting a Flutter view running |project|.
+  explicit FlutterWindow(const flutter::DartProject& project);
   virtual ~FlutterWindow();
 
  protected:
@@ -26,9 +23,6 @@ class FlutterWindow : public Win32Window {
                          LPARAM const lparam) noexcept override;
 
  private:
-  // The run loop driving events for this window.
-  RunLoop* run_loop_;
-
   // The project to run.
   flutter::DartProject project_;
 
diff --git a/flutter_cache_manager/example/windows/runner/main.cpp b/flutter_cache_manager/example/windows/runner/main.cpp
index fc17fec6..a61bf80d 100644
--- a/flutter_cache_manager/example/windows/runner/main.cpp
+++ b/flutter_cache_manager/example/windows/runner/main.cpp
@@ -3,7 +3,6 @@
 #include <windows.h>
 
 #include "flutter_window.h"
-#include "run_loop.h"
 #include "utils.h"
 
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
@@ -18,18 +17,26 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   // plugins.
   ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
 
-  RunLoop run_loop;
-
   flutter::DartProject project(L"data");
-  FlutterWindow window(&run_loop, project);
+
+  std::vector<std::string> command_line_arguments =
+      GetCommandLineArguments();
+
+  project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
+
+  FlutterWindow window(project);
   Win32Window::Point origin(10, 10);
   Win32Window::Size size(1280, 720);
-  if (!window.CreateAndShow(L"example", origin, size)) {
+  if (!window.Create(L"example", origin, size)) {
     return EXIT_FAILURE;
   }
   window.SetQuitOnClose(true);
 
-  run_loop.Run();
+  ::MSG msg;
+  while (::GetMessage(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
 
   ::CoUninitialize();
   return EXIT_SUCCESS;
diff --git a/flutter_cache_manager/example/windows/runner/run_loop.cpp b/flutter_cache_manager/example/windows/runner/run_loop.cpp
deleted file mode 100644
index 2d6636ab..00000000
--- a/flutter_cache_manager/example/windows/runner/run_loop.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "run_loop.h"
-
-#include <windows.h>
-
-#include <algorithm>
-
-RunLoop::RunLoop() {}
-
-RunLoop::~RunLoop() {}
-
-void RunLoop::Run() {
-  bool keep_running = true;
-  TimePoint next_flutter_event_time = TimePoint::clock::now();
-  while (keep_running) {
-    std::chrono::nanoseconds wait_duration =
-        std::max(std::chrono::nanoseconds(0),
-                 next_flutter_event_time - TimePoint::clock::now());
-    ::MsgWaitForMultipleObjects(
-        0, nullptr, FALSE, static_cast<DWORD>(wait_duration.count() / 1000),
-        QS_ALLINPUT);
-    bool processed_events = false;
-    MSG message;
-    // All pending Windows messages must be processed; MsgWaitForMultipleObjects
-    // won't return again for items left in the queue after PeekMessage.
-    while (::PeekMessage(&message, nullptr, 0, 0, PM_REMOVE)) {
-      processed_events = true;
-      if (message.message == WM_QUIT) {
-        keep_running = false;
-        break;
-      }
-      ::TranslateMessage(&message);
-      ::DispatchMessage(&message);
-      // Allow Flutter to process messages each time a Windows message is
-      // processed, to prevent starvation.
-      next_flutter_event_time =
-          std::min(next_flutter_event_time, ProcessFlutterMessages());
-    }
-    // If the PeekMessage loop didn't run, process Flutter messages.
-    if (!processed_events) {
-      next_flutter_event_time =
-          std::min(next_flutter_event_time, ProcessFlutterMessages());
-    }
-  }
-}
-
-void RunLoop::RegisterFlutterInstance(
-    flutter::FlutterEngine* flutter_instance) {
-  flutter_instances_.insert(flutter_instance);
-}
-
-void RunLoop::UnregisterFlutterInstance(
-    flutter::FlutterEngine* flutter_instance) {
-  flutter_instances_.erase(flutter_instance);
-}
-
-RunLoop::TimePoint RunLoop::ProcessFlutterMessages() {
-  TimePoint next_event_time = TimePoint::max();
-  for (auto instance : flutter_instances_) {
-    std::chrono::nanoseconds wait_duration = instance->ProcessMessages();
-    if (wait_duration != std::chrono::nanoseconds::max()) {
-      next_event_time =
-          std::min(next_event_time, TimePoint::clock::now() + wait_duration);
-    }
-  }
-  return next_event_time;
-}
diff --git a/flutter_cache_manager/example/windows/runner/run_loop.h b/flutter_cache_manager/example/windows/runner/run_loop.h
deleted file mode 100644
index 000d3624..00000000
--- a/flutter_cache_manager/example/windows/runner/run_loop.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef RUNNER_RUN_LOOP_H_
-#define RUNNER_RUN_LOOP_H_
-
-#include <flutter/flutter_engine.h>
-
-#include <chrono>
-#include <set>
-
-// A runloop that will service events for Flutter instances as well
-// as native messages.
-class RunLoop {
- public:
-  RunLoop();
-  ~RunLoop();
-
-  // Prevent copying
-  RunLoop(RunLoop const&) = delete;
-  RunLoop& operator=(RunLoop const&) = delete;
-
-  // Runs the run loop until the application quits.
-  void Run();
-
-  // Registers the given Flutter instance for event servicing.
-  void RegisterFlutterInstance(
-      flutter::FlutterEngine* flutter_instance);
-
-  // Unregisters the given Flutter instance from event servicing.
-  void UnregisterFlutterInstance(
-      flutter::FlutterEngine* flutter_instance);
-
- private:
-  using TimePoint = std::chrono::steady_clock::time_point;
-
-  // Processes all currently pending messages for registered Flutter instances.
-  TimePoint ProcessFlutterMessages();
-
-  std::set<flutter::FlutterEngine*> flutter_instances_;
-};
-
-#endif  // RUNNER_RUN_LOOP_H_
diff --git a/flutter_cache_manager/example/windows/runner/runner.exe.manifest b/flutter_cache_manager/example/windows/runner/runner.exe.manifest
index c977c4a4..a42ea768 100644
--- a/flutter_cache_manager/example/windows/runner/runner.exe.manifest
+++ b/flutter_cache_manager/example/windows/runner/runner.exe.manifest
@@ -7,7 +7,7 @@
   </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- Windows 10 -->
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
diff --git a/flutter_cache_manager/example/windows/runner/utils.cpp b/flutter_cache_manager/example/windows/runner/utils.cpp
index 37501e5d..b2b08734 100644
--- a/flutter_cache_manager/example/windows/runner/utils.cpp
+++ b/flutter_cache_manager/example/windows/runner/utils.cpp
@@ -20,3 +20,46 @@ void CreateAndAttachConsole() {
     FlutterDesktopResyncOutputStreams();
   }
 }
+
+std::vector<std::string> GetCommandLineArguments() {
+  // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
+  int argc;
+  wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
+  if (argv == nullptr) {
+    return std::vector<std::string>();
+  }
+
+  std::vector<std::string> command_line_arguments;
+
+  // Skip the first argument as it's the binary name.
+  for (int i = 1; i < argc; i++) {
+    command_line_arguments.push_back(Utf8FromUtf16(argv[i]));
+  }
+
+  ::LocalFree(argv);
+
+  return command_line_arguments;
+}
+
+std::string Utf8FromUtf16(const wchar_t* utf16_string) {
+  if (utf16_string == nullptr) {
+    return std::string();
+  }
+  int target_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      -1, nullptr, 0, nullptr, nullptr)
+    -1; // remove the trailing null character
+  int input_length = (int)wcslen(utf16_string);
+  std::string utf8_string;
+  if (target_length <= 0 || target_length > utf8_string.max_size()) {
+    return utf8_string;
+  }
+  utf8_string.resize(target_length);
+  int converted_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      input_length, utf8_string.data(), target_length, nullptr, nullptr);
+  if (converted_length == 0) {
+    return std::string();
+  }
+  return utf8_string;
+}
diff --git a/flutter_cache_manager/example/windows/runner/utils.h b/flutter_cache_manager/example/windows/runner/utils.h
index d792603b..3879d547 100644
--- a/flutter_cache_manager/example/windows/runner/utils.h
+++ b/flutter_cache_manager/example/windows/runner/utils.h
@@ -1,8 +1,19 @@
 #ifndef RUNNER_UTILS_H_
 #define RUNNER_UTILS_H_
 
+#include <string>
+#include <vector>
+
 // Creates a console for the process, and redirects stdout and stderr to
 // it for both the runner and the Flutter library.
 void CreateAndAttachConsole();
 
+// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
+// encoded in UTF-8. Returns an empty std::string on failure.
+std::string Utf8FromUtf16(const wchar_t* utf16_string);
+
+// Gets the command line arguments passed in as a std::vector<std::string>,
+// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
+std::vector<std::string> GetCommandLineArguments();
+
 #endif  // RUNNER_UTILS_H_
diff --git a/flutter_cache_manager/example/windows/runner/win32_window.cpp b/flutter_cache_manager/example/windows/runner/win32_window.cpp
index efc3eb9f..60608d0f 100644
--- a/flutter_cache_manager/example/windows/runner/win32_window.cpp
+++ b/flutter_cache_manager/example/windows/runner/win32_window.cpp
@@ -1,13 +1,31 @@
 #include "win32_window.h"
 
+#include <dwmapi.h>
 #include <flutter_windows.h>
 
 #include "resource.h"
 
 namespace {
 
+/// Window attribute that enables dark mode window decorations.
+///
+/// Redefined in case the developer's machine has a Windows SDK older than
+/// version 10.0.22000.0.
+/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+
 constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
 
+/// Registry key for app theme preference.
+///
+/// A value of 0 indicates apps should use dark mode. A non-zero or missing
+/// value indicates apps should use light mode.
+constexpr const wchar_t kGetPreferredBrightnessRegKey[] =
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
+
 // The number of Win32Window objects that currently exist.
 static int g_active_window_count = 0;
 
@@ -31,8 +49,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {
           GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
   if (enable_non_client_dpi_scaling != nullptr) {
     enable_non_client_dpi_scaling(hwnd);
-    FreeLibrary(user32_module);
   }
+  FreeLibrary(user32_module);
 }
 
 }  // namespace
@@ -42,7 +60,7 @@ class WindowClassRegistrar {
  public:
   ~WindowClassRegistrar() = default;
 
-  // Returns the singleton registar instance.
+  // Returns the singleton registrar instance.
   static WindowClassRegistrar* GetInstance() {
     if (!instance_) {
       instance_ = new WindowClassRegistrar();
@@ -102,9 +120,9 @@ Win32Window::~Win32Window() {
   Destroy();
 }
 
-bool Win32Window::CreateAndShow(const std::wstring& title,
-                                const Point& origin,
-                                const Size& size) {
+bool Win32Window::Create(const std::wstring& title,
+                         const Point& origin,
+                         const Size& size) {
   Destroy();
 
   const wchar_t* window_class =
@@ -117,7 +135,7 @@ bool Win32Window::CreateAndShow(const std::wstring& title,
   double scale_factor = dpi / 96.0;
 
   HWND window = CreateWindow(
-      window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+      window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
       Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
       Scale(size.width, scale_factor), Scale(size.height, scale_factor),
       nullptr, nullptr, GetModuleHandle(nullptr), this);
@@ -126,9 +144,15 @@ bool Win32Window::CreateAndShow(const std::wstring& title,
     return false;
   }
 
+  UpdateTheme(window);
+
   return OnCreate();
 }
 
+bool Win32Window::Show() {
+  return ShowWindow(window_handle_, SW_SHOWNORMAL);
+}
+
 // static
 LRESULT CALLBACK Win32Window::WndProc(HWND const window,
                                       UINT const message,
@@ -173,7 +197,7 @@ Win32Window::MessageHandler(HWND hwnd,
 
       return 0;
     }
-    case WM_SIZE:
+    case WM_SIZE: {
       RECT rect = GetClientArea();
       if (child_content_ != nullptr) {
         // Size and position the child window.
@@ -181,12 +205,17 @@ Win32Window::MessageHandler(HWND hwnd,
                    rect.bottom - rect.top, TRUE);
       }
       return 0;
+    }
 
     case WM_ACTIVATE:
       if (child_content_ != nullptr) {
         SetFocus(child_content_);
       }
       return 0;
+
+    case WM_DWMCOLORIZATIONCOLORCHANGED:
+      UpdateTheme(hwnd);
+      return 0;
   }
 
   return DefWindowProc(window_handle_, message, wparam, lparam);
@@ -242,3 +271,18 @@ bool Win32Window::OnCreate() {
 void Win32Window::OnDestroy() {
   // No-op; provided for subclasses.
 }
+
+void Win32Window::UpdateTheme(HWND const window) {
+  DWORD light_mode;
+  DWORD light_mode_size = sizeof(light_mode);
+  LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
+                               kGetPreferredBrightnessRegValue,
+                               RRF_RT_REG_DWORD, nullptr, &light_mode,
+                               &light_mode_size);
+
+  if (result == ERROR_SUCCESS) {
+    BOOL enable_dark_mode = light_mode == 0;
+    DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE,
+                          &enable_dark_mode, sizeof(enable_dark_mode));
+  }
+}
diff --git a/flutter_cache_manager/example/windows/runner/win32_window.h b/flutter_cache_manager/example/windows/runner/win32_window.h
index 17ba4311..e901dde6 100644
--- a/flutter_cache_manager/example/windows/runner/win32_window.h
+++ b/flutter_cache_manager/example/windows/runner/win32_window.h
@@ -28,15 +28,16 @@ class Win32Window {
   Win32Window();
   virtual ~Win32Window();
 
-  // Creates and shows a win32 window with |title| and position and size using
+  // Creates a win32 window with |title| that is positioned and sized using
   // |origin| and |size|. New windows are created on the default monitor. Window
   // sizes are specified to the OS in physical pixels, hence to ensure a
-  // consistent size to will treat the width height passed in to this function
-  // as logical pixels and scale to appropriate for the default monitor. Returns
-  // true if the window was created successfully.
-  bool CreateAndShow(const std::wstring& title,
-                     const Point& origin,
-                     const Size& size);
+  // consistent size this function will scale the inputted width and height as
+  // as appropriate for the default monitor. The window is invisible until
+  // |Show| is called. Returns true if the window was created successfully.
+  bool Create(const std::wstring& title, const Point& origin, const Size& size);
+
+  // Show the current window. Returns true if the window was successfully shown.
+  bool Show();
 
   // Release OS resources associated with window.
   void Destroy();
@@ -76,7 +77,7 @@ class Win32Window {
   // OS callback called by message pump. Handles the WM_NCCREATE message which
   // is passed when the non-client area is being created and enables automatic
   // non-client DPI scaling so that the non-client area automatically
-  // responsponds to changes in DPI. All other messages are handled by
+  // responds to changes in DPI. All other messages are handled by
   // MessageHandler.
   static LRESULT CALLBACK WndProc(HWND const window,
                                   UINT const message,
@@ -86,6 +87,9 @@ class Win32Window {
   // Retrieves a class instance pointer for |window|
   static Win32Window* GetThisFromHandle(HWND const window) noexcept;
 
+  // Update the window frame's theme to match the system theme.
+  static void UpdateTheme(HWND const window);
+
   bool quit_on_close_ = false;
 
   // window handle for top level window.
diff --git a/flutter_cache_manager/lib/flutter_cache_manager.dart b/flutter_cache_manager/lib/flutter_cache_manager.dart
index 6d436c45..be1d3b26 100644
--- a/flutter_cache_manager/lib/flutter_cache_manager.dart
+++ b/flutter_cache_manager/lib/flutter_cache_manager.dart
@@ -1,3 +1,7 @@
+/// Generic cache manager for flutter.
+/// Saves web files on the storages of the device and saves the cache info using sqflite
+library flutter_cache_manager;
+
 export 'src/cache_manager.dart';
 export 'src/cache_managers/cache_managers.dart';
 export 'src/compat/file_fetcher.dart';
diff --git a/flutter_cache_manager/lib/src/cache_manager.dart b/flutter_cache_manager/lib/src/cache_manager.dart
index 6d85e40d..747beb9a 100644
--- a/flutter_cache_manager/lib/src/cache_manager.dart
+++ b/flutter_cache_manager/lib/src/cache_manager.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:file/file.dart';
-import 'package:flutter/foundation.dart';
+import 'package:flutter/foundation.dart' show visibleForTesting;
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_cache_manager/src/cache_store.dart';
 import 'package:flutter_cache_manager/src/storage/cache_object.dart';
@@ -114,8 +114,13 @@ class CacheManager implements BaseCacheManager {
     return streamController.stream;
   }
 
-  Future<void> _pushFileToStream(StreamController streamController, String url,
-      String? key, Map<String, String>? headers, bool withProgress) async {
+  Future<void> _pushFileToStream(
+    StreamController<dynamic> streamController,
+    String url,
+    String? key,
+    Map<String, String>? headers,
+    bool withProgress,
+  ) async {
     key ??= url;
     FileInfo? cacheFile;
     try {
@@ -124,14 +129,14 @@ class CacheManager implements BaseCacheManager {
         streamController.add(cacheFile);
         withProgress = false;
       }
-    } catch (e) {
+    } on Object catch (e) {
       cacheLogger.log(
           'CacheManager: Failed to load cached file for $url with error:\n$e',
           CacheManagerLogLevel.debug);
     }
     if (cacheFile == null || cacheFile.validTill.isBefore(DateTime.now())) {
       try {
-        await for (var response
+        await for (final response
             in _webHelper.downloadFile(url, key: key, authHeaders: headers)) {
           if (response is DownloadProgress && withProgress) {
             streamController.add(response);
@@ -140,7 +145,7 @@ class CacheManager implements BaseCacheManager {
             streamController.add(response);
           }
         }
-      } catch (e) {
+      } on Object catch (e) {
         cacheLogger.log(
             'CacheManager: Failed to download file from $url with error:\n$e',
             CacheManagerLogLevel.debug);
@@ -149,7 +154,7 @@ class CacheManager implements BaseCacheManager {
         }
       }
     }
-    unawaited(streamController.close());
+    streamController.close();
   }
 
   ///Download the file and add to cache
@@ -159,7 +164,7 @@ class CacheManager implements BaseCacheManager {
       Map<String, String>? authHeaders,
       bool force = false}) async {
     key ??= url;
-    var fileResponse = await _webHelper
+    final fileResponse = await _webHelper
         .downloadFile(
           url,
           key: key,
@@ -213,7 +218,7 @@ class CacheManager implements BaseCacheManager {
 
     final file = await _config.fileSystem.createFile(cacheObject.relativePath);
     await file.writeAsBytes(fileBytes);
-    unawaited(_store.putFile(cacheObject));
+    _store.putFile(cacheObject);
     return file;
   }
 
@@ -246,16 +251,16 @@ class CacheManager implements BaseCacheManager {
       eTag: eTag,
     );
 
-    var file = await _config.fileSystem.createFile(cacheObject.relativePath);
+    final file = await _config.fileSystem.createFile(cacheObject.relativePath);
 
     // Always copy file
-    var sink = file.openWrite();
+    final sink = file.openWrite();
     await source
         // this map is need to map UInt8List to List<int>
         .map((event) => event)
         .pipe(sink);
 
-    unawaited(_store.putFile(cacheObject));
+    _store.putFile(cacheObject);
     return file;
   }
 
diff --git a/flutter_cache_manager/lib/src/cache_managers/base_cache_manager.dart b/flutter_cache_manager/lib/src/cache_managers/base_cache_manager.dart
index 99206403..7449a1bc 100644
--- a/flutter_cache_manager/lib/src/cache_managers/base_cache_manager.dart
+++ b/flutter_cache_manager/lib/src/cache_managers/base_cache_manager.dart
@@ -1,9 +1,8 @@
 import 'dart:typed_data';
 
 import 'package:file/file.dart';
-
-import '../result/file_info.dart';
-import '../result/file_response.dart';
+import 'package:flutter_cache_manager/src/result/file_info.dart';
+import 'package:flutter_cache_manager/src/result/file_response.dart';
 
 /// Interface of the CacheManager. In general [CacheManager] can be used
 /// directly.
diff --git a/flutter_cache_manager/lib/src/cache_managers/default_cache_manager.dart b/flutter_cache_manager/lib/src/cache_managers/default_cache_manager.dart
index 17e34e63..15d83c57 100644
--- a/flutter_cache_manager/lib/src/cache_managers/default_cache_manager.dart
+++ b/flutter_cache_manager/lib/src/cache_managers/default_cache_manager.dart
@@ -1,4 +1,4 @@
-import '../../flutter_cache_manager.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 /// The DefaultCacheManager that can be easily used directly. The code of
 /// this implementation can be used as inspiration for more complex cache
@@ -7,6 +7,7 @@ class DefaultCacheManager extends CacheManager with ImageCacheManager {
   static const key = 'libCachedImageData';
 
   static final DefaultCacheManager _instance = DefaultCacheManager._();
+
   factory DefaultCacheManager() {
     return _instance;
   }
diff --git a/flutter_cache_manager/lib/src/cache_managers/image_cache_manager.dart b/flutter_cache_manager/lib/src/cache_managers/image_cache_manager.dart
index 27443f8a..614d7d9d 100644
--- a/flutter_cache_manager/lib/src/cache_managers/image_cache_manager.dart
+++ b/flutter_cache_manager/lib/src/cache_managers/image_cache_manager.dart
@@ -36,7 +36,7 @@ mixin ImageCacheManager on BaseCacheManager {
     if (maxHeight != null) resizedKey += '_h$maxHeight';
     resizedKey += '_$key';
 
-    var fromCache = await getFileFromCache(resizedKey);
+    final fromCache = await getFileFromCache(resizedKey);
     if (fromCache != null) {
       yield fromCache;
       if (fromCache.validTill.isAfter(DateTime.now())) {
@@ -69,38 +69,38 @@ mixin ImageCacheManager on BaseCacheManager {
     int? maxWidth,
     int? maxHeight,
   ) async {
-    var originalFileName = originalFile.file.path;
-    var fileExtension = originalFileName.split('.').last;
+    final originalFileName = originalFile.file.path;
+    final fileExtension = originalFileName.split('.').last;
     if (!supportedFileNames.contains(fileExtension)) {
       return originalFile;
     }
 
-    var image = await _decodeImage(originalFile.file);
+    final image = await _decodeImage(originalFile.file);
 
-    var shouldResize = maxWidth != null
+    final shouldResize = maxWidth != null
         ? image.width > maxWidth
         : false || maxHeight != null
             ? image.height > maxHeight
             : false;
     if (!shouldResize) return originalFile;
     if (maxWidth != null && maxHeight != null) {
-      var resizeFactorWidth = image.width / maxWidth;
-      var resizeFactorHeight = image.height / maxHeight;
-      var resizeFactor = max(resizeFactorHeight, resizeFactorWidth);
+      final resizeFactorWidth = image.width / maxWidth;
+      final resizeFactorHeight = image.height / maxHeight;
+      final resizeFactor = max(resizeFactorHeight, resizeFactorWidth);
 
       maxWidth = (image.width / resizeFactor).round();
       maxHeight = (image.height / resizeFactor).round();
     }
 
-    var resized = await _decodeImage(originalFile.file,
-        width: maxWidth, height: maxHeight, allowUpscaling: false);
-    var resizedFile =
+    final resized = await _decodeImage(originalFile.file,
+        width: maxWidth, height: maxHeight);
+    final resizedFile =
         (await resized.toByteData(format: ui.ImageByteFormat.png))!
             .buffer
             .asUint8List();
-    var maxAge = originalFile.validTill.difference(DateTime.now());
+    final maxAge = originalFile.validTill.difference(DateTime.now());
 
-    var file = await putFile(
+    final file = await putFile(
       originalFile.originalUrl,
       resizedFile,
       key: key,
@@ -125,7 +125,7 @@ mixin ImageCacheManager on BaseCacheManager {
     int? maxWidth,
     int? maxHeight,
   }) async* {
-    await for (var response in getFileStream(
+    await for (final response in getFileStream(
       url,
       key: originalKey,
       headers: headers,
@@ -148,15 +148,15 @@ mixin ImageCacheManager on BaseCacheManager {
 
 Future<ui.Image> _decodeImage(File file,
     {int? width, int? height, bool allowUpscaling = false}) {
-  var shouldResize = width != null || height != null;
-  var fileImage = FileImage(file);
+  final shouldResize = width != null || height != null;
+  final fileImage = FileImage(file);
   final image = shouldResize
       ? ResizeImage(fileImage,
           width: width, height: height, allowUpscaling: allowUpscaling)
       : fileImage as ImageProvider;
   final completer = Completer<ui.Image>();
   image
-      .resolve(const ImageConfiguration())
+      .resolve(ImageConfiguration.empty)
       .addListener(ImageStreamListener((info, _) {
     completer.complete(info.image);
     image.evict();
diff --git a/flutter_cache_manager/lib/src/cache_store.dart b/flutter_cache_manager/lib/src/cache_store.dart
index 295b516e..395e3eaf 100644
--- a/flutter_cache_manager/lib/src/cache_store.dart
+++ b/flutter_cache_manager/lib/src/cache_store.dart
@@ -1,10 +1,9 @@
 import 'dart:async';
 
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:flutter_cache_manager/src/storage/cache_object.dart';
 import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
 
-import '../flutter_cache_manager.dart';
-import 'storage/cache_object.dart';
-
 ///Flutter Cache Manager
 ///Copyright (c) 2019 Rene Floor
 ///Released under MIT License.
@@ -18,9 +17,12 @@ class CacheStore {
   FileSystem fileSystem;
 
   final Config _config;
+
   String get storeKey => _config.cacheKey;
   final Future<CacheInfoRepository> _cacheInfoRepository;
+
   int get _capacity => _config.maxNrOfCacheObjects;
+
   Duration get _maxAge => _config.stalePeriod;
 
   DateTime lastCleanupRun = DateTime.now();
@@ -68,7 +70,7 @@ class CacheStore {
     }
     if (!_futureCache.containsKey(key)) {
       final completer = Completer<CacheObject?>();
-      unawaited(_getCacheDataFromDatabase(key).then((cacheObject) async {
+      _getCacheDataFromDatabase(key).then((cacheObject) async {
         if (cacheObject?.id != null && !await _fileExists(cacheObject)) {
           final provider = await _cacheInfoRepository;
           await provider.delete(cacheObject!.id!);
@@ -82,7 +84,7 @@ class CacheStore {
         }
         completer.complete(cacheObject);
         _futureCache.remove(key);
-      }));
+      });
       _futureCache[key] = completer.future;
     }
     return _futureCache[key];
@@ -102,7 +104,7 @@ class CacheStore {
     if (cacheObject == null) {
       return false;
     }
-    var file = await fileSystem.createFile(cacheObject.relativePath);
+    final file = await fileSystem.createFile(cacheObject.relativePath);
     return file.exists();
   }
 
@@ -110,7 +112,7 @@ class CacheStore {
     final provider = await _cacheInfoRepository;
     final data = await provider.get(key);
     if (await _fileExists(data)) {
-      unawaited(_updateCacheDataInDatabase(data!));
+      _updateCacheDataInDatabase(data!);
     }
     _scheduleCleanup();
     return data;
@@ -137,12 +139,12 @@ class CacheStore {
 
     final overCapacity = await provider.getObjectsOverCapacity(_capacity);
     for (final cacheObject in overCapacity) {
-      unawaited(_removeCachedFile(cacheObject, toRemove));
+      _removeCachedFile(cacheObject, toRemove);
     }
 
     final oldObjects = await provider.getOldObjects(_maxAge);
     for (final cacheObject in oldObjects) {
-      unawaited(_removeCachedFile(cacheObject, toRemove));
+      _removeCachedFile(cacheObject, toRemove);
     }
 
     await provider.deleteAll(toRemove);
@@ -153,7 +155,7 @@ class CacheStore {
     final toRemove = <int>[];
     final allObjects = await provider.getAllObjects();
     for (final cacheObject in allObjects) {
-      unawaited(_removeCachedFile(cacheObject, toRemove));
+      _removeCachedFile(cacheObject, toRemove);
     }
     await provider.deleteAll(toRemove);
   }
diff --git a/flutter_cache_manager/lib/src/compat/file_fetcher.dart b/flutter_cache_manager/lib/src/compat/file_fetcher.dart
index 59e44b9d..ce3ec589 100644
--- a/flutter_cache_manager/lib/src/compat/file_fetcher.dart
+++ b/flutter_cache_manager/lib/src/compat/file_fetcher.dart
@@ -12,8 +12,7 @@ typedef FileFetcher = Future<FileFetcherResponse> Function(String url,
     {Map<String, String>? headers});
 
 abstract class FileFetcherResponse {
-  // ignore: always_declare_return_types
-  get statusCode;
+  Object get statusCode;
 
   Uint8List get bodyBytes;
 
@@ -42,6 +41,5 @@ class HttpFileFetcherResponse implements FileFetcherResponse {
   Uint8List get bodyBytes => _response.bodyBytes;
 
   @override
-  // ignore: always_declare_return_types
-  get statusCode => _response.statusCode;
+  Object get statusCode => _response.statusCode;
 }
diff --git a/flutter_cache_manager/lib/src/compat/file_service_compat.dart b/flutter_cache_manager/lib/src/compat/file_service_compat.dart
index 874da63f..0df201e1 100644
--- a/flutter_cache_manager/lib/src/compat/file_service_compat.dart
+++ b/flutter_cache_manager/lib/src/compat/file_service_compat.dart
@@ -1,18 +1,18 @@
 import 'dart:io';
 
 import 'package:clock/clock.dart';
-
-import '../../flutter_cache_manager.dart';
-import '../web/mime_converter.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:flutter_cache_manager/src/web/mime_converter.dart';
 
 class FileServiceCompat extends FileService {
   final FileFetcher fileFetcher;
+
   FileServiceCompat(this.fileFetcher);
 
   @override
   Future<FileServiceResponse> get(String url,
       {Map<String, String>? headers}) async {
-    var legacyResponse = await fileFetcher(url, headers: headers);
+    final legacyResponse = await fileFetcher(url, headers: headers);
     return CompatFileServiceGetResponse(legacyResponse);
   }
 }
@@ -43,10 +43,11 @@ class CompatFileServiceGetResponse implements FileServiceResponse {
       for (final setting in controlSettings) {
         final sanitizedSetting = setting.trim().toLowerCase();
         if (sanitizedSetting == 'no-cache') {
-          ageDuration = const Duration();
+          ageDuration = Duration.zero;
         }
         if (sanitizedSetting.startsWith('max-age=')) {
-          var validSeconds = int.tryParse(sanitizedSetting.split('=')[1]) ?? 0;
+          final validSeconds =
+              int.tryParse(sanitizedSetting.split('=')[1]) ?? 0;
           if (validSeconds > 0) {
             ageDuration = Duration(seconds: validSeconds);
           }
@@ -65,7 +66,7 @@ class CompatFileServiceGetResponse implements FileServiceResponse {
     var fileExtension = '';
     final contentTypeHeader = _header(HttpHeaders.contentTypeHeader);
     if (contentTypeHeader != null) {
-      var contentType = ContentType.parse(contentTypeHeader);
+      final contentType = ContentType.parse(contentTypeHeader);
       fileExtension = contentType.fileExtension;
     }
     return fileExtension;
diff --git a/flutter_cache_manager/lib/src/config/_config_io.dart b/flutter_cache_manager/lib/src/config/_config_io.dart
index 1084572f..9ff7eadf 100644
--- a/flutter_cache_manager/lib/src/config/_config_io.dart
+++ b/flutter_cache_manager/lib/src/config/_config_io.dart
@@ -1,11 +1,10 @@
 import 'dart:io';
 
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:flutter_cache_manager/src/config/config.dart' as def;
 import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
 import 'package:flutter_cache_manager/src/storage/file_system/file_system_io.dart';
 
-import 'config.dart' as def;
-
 class Config implements def.Config {
   Config(
     this.cacheKey, {
diff --git a/flutter_cache_manager/lib/src/config/_config_unsupported.dart b/flutter_cache_manager/lib/src/config/_config_unsupported.dart
index 57386bc3..b14ebeb3 100644
--- a/flutter_cache_manager/lib/src/config/_config_unsupported.dart
+++ b/flutter_cache_manager/lib/src/config/_config_unsupported.dart
@@ -1,9 +1,8 @@
+import 'package:flutter_cache_manager/src/config/config.dart' as def;
 import 'package:flutter_cache_manager/src/storage/cache_info_repositories/cache_info_repository.dart';
 import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
 import 'package:flutter_cache_manager/src/web/file_service.dart';
 
-import 'config.dart' as def;
-
 class Config implements def.Config {
   //ignore: avoid_unused_constructor_parameters
   Config(
diff --git a/flutter_cache_manager/lib/src/config/_config_web.dart b/flutter_cache_manager/lib/src/config/_config_web.dart
index dce3622f..3b1e433c 100644
--- a/flutter_cache_manager/lib/src/config/_config_web.dart
+++ b/flutter_cache_manager/lib/src/config/_config_web.dart
@@ -1,11 +1,10 @@
+import 'package:flutter_cache_manager/src/config/config.dart' as def;
 import 'package:flutter_cache_manager/src/storage/cache_info_repositories/cache_info_repository.dart';
 import 'package:flutter_cache_manager/src/storage/cache_info_repositories/non_storing_object_provider.dart';
 import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
 import 'package:flutter_cache_manager/src/storage/file_system/file_system_web.dart';
 import 'package:flutter_cache_manager/src/web/file_service.dart';
 
-import 'config.dart' as def;
-
 class Config implements def.Config {
   Config(
     this.cacheKey, {
diff --git a/flutter_cache_manager/lib/src/config/config.dart b/flutter_cache_manager/lib/src/config/config.dart
index 655ead43..a0dc4894 100644
--- a/flutter_cache_manager/lib/src/config/config.dart
+++ b/flutter_cache_manager/lib/src/config/config.dart
@@ -1,9 +1,8 @@
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
-import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
-
-import '_config_unsupported.dart'
+import 'package:flutter_cache_manager/src/config/_config_unsupported.dart'
     if (dart.library.html) '_config_web.dart'
     if (dart.library.io) '_config_io.dart' as impl;
+import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
 
 abstract class Config {
   /// Config file for the CacheManager.
@@ -32,9 +31,14 @@ abstract class Config {
   }) = impl.Config;
 
   String get cacheKey;
+
   Duration get stalePeriod;
+
   int get maxNrOfCacheObjects;
+
   CacheInfoRepository get repo;
+
   FileSystem get fileSystem;
+
   FileService get fileService;
 }
diff --git a/flutter_cache_manager/lib/src/logger.dart b/flutter_cache_manager/lib/src/logger.dart
index c5878f8d..75d08bec 100644
--- a/flutter_cache_manager/lib/src/logger.dart
+++ b/flutter_cache_manager/lib/src/logger.dart
@@ -1,4 +1,4 @@
-import '../flutter_cache_manager.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 /// Instance of the cache manager. Can be set to a custom one if preferred.
 CacheLogger cacheLogger = CacheLogger();
@@ -14,7 +14,7 @@ enum CacheManagerLogLevel {
 
 /// [CacheLogger] which is used by the cache manager to log useful information
 class CacheLogger {
-  /// Function to log a message on a certain loglevel
+  /// Function to log a message on a certain log level
   void log(String message, CacheManagerLogLevel level) {
     if (CacheManager.logLevel.index >= level.index) {
       // ignore: avoid_print
diff --git a/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_info_repository.dart b/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_info_repository.dart
index 8a122503..5a282b24 100644
--- a/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_info_repository.dart
+++ b/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_info_repository.dart
@@ -43,7 +43,7 @@ abstract class CacheInfoRepository {
   Future<List<CacheObject>> getOldObjects(Duration maxAge);
 
   /// Close the connection to the repository. If this is the last connection
-  /// to the repository it will return true and the repository is trully
+  /// to the repository it will return true and the repository is truly
   /// closed. If there are still open connections it will return false;
   Future<bool> close();
 
@@ -56,9 +56,9 @@ extension MigrationExtension on CacheInfoRepository {
     if (!await previousRepository.exists()) return;
 
     await previousRepository.open();
-    var cacheObjects = await previousRepository.getAllObjects();
+    final cacheObjects = await previousRepository.getAllObjects();
     await _putAll(cacheObjects);
-    var isClosed = await previousRepository.close();
+    final isClosed = await previousRepository.close();
     if (!isClosed) {
       cacheLogger.log('Deleting an open repository while migrating.',
           CacheManagerLogLevel.warning);
@@ -67,9 +67,9 @@ extension MigrationExtension on CacheInfoRepository {
   }
 
   Future<List<CacheObject>> _putAll(List<CacheObject> cacheObjects) async {
-    var storedObjects = <CacheObject>[];
-    for (var newObject in cacheObjects) {
-      var existingObject = await get(newObject.key);
+    final storedObjects = <CacheObject>[];
+    for (final newObject in cacheObjects) {
+      final existingObject = await get(newObject.key);
       final CacheObject storedObject;
       if (existingObject == null) {
         storedObject = await insert(
diff --git a/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_object_provider.dart b/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_object_provider.dart
index 8e3b92a6..16bf5656 100644
--- a/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_object_provider.dart
+++ b/flutter_cache_manager/lib/src/storage/cache_info_repositories/cache_object_provider.dart
@@ -1,11 +1,11 @@
 import 'dart:io';
 
+import 'package:flutter_cache_manager/src/storage/cache_info_repositories/cache_info_repository.dart';
 import 'package:flutter_cache_manager/src/storage/cache_info_repositories/helper_methods.dart';
+import 'package:flutter_cache_manager/src/storage/cache_object.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:sqflite/sqflite.dart';
-import '../cache_object.dart';
-import 'cache_info_repository.dart';
 
 const _tableCacheObject = 'cacheObject';
 
@@ -25,7 +25,7 @@ class CacheObjectProvider extends CacheInfoRepository
     if (!shouldOpenOnNewConnection()) {
       return openCompleter!.future;
     }
-    var path = await _getPath();
+    final path = await _getPath();
     await File(path).parent.create(recursive: true);
     db = await openDatabase(path, version: 3,
         onCreate: (Database db, int version) async {
@@ -98,7 +98,7 @@ class CacheObjectProvider extends CacheInfoRepository
   @override
   Future<CacheObject> insert(CacheObject cacheObject,
       {bool setTouchedToNow = true}) async {
-    var id = await db!.insert(
+    final id = await db!.insert(
       _tableCacheObject,
       cacheObject.toMap(setTouchedToNow: setTouchedToNow),
     );
@@ -107,7 +107,7 @@ class CacheObjectProvider extends CacheInfoRepository
 
   @override
   Future<CacheObject?> get(String key) async {
-    List<Map> maps = await db!.query(_tableCacheObject,
+    final List<Map<dynamic, dynamic>> maps = await db!.query(_tableCacheObject,
         columns: null, where: '${CacheObject.columnKey} = ?', whereArgs: [key]);
     if (maps.isNotEmpty) {
       return CacheObject.fromMap(maps.first.cast<String, dynamic>());
@@ -124,7 +124,7 @@ class CacheObjectProvider extends CacheInfoRepository
   @override
   Future<int> deleteAll(Iterable<int> ids) {
     return db!.delete(_tableCacheObject,
-        where: '${CacheObject.columnId} IN (' + ids.join(',') + ')');
+        where: '${CacheObject.columnId} IN (${ids.join(',')})');
   }
 
   @override
@@ -178,7 +178,7 @@ class CacheObjectProvider extends CacheInfoRepository
   }
 
   @override
-  Future deleteDataFile() async {
+  Future<void> deleteDataFile() async {
     await _getPath();
   }
 
@@ -193,7 +193,7 @@ class CacheObjectProvider extends CacheInfoRepository
     if (_path != null) {
       directory = File(_path!).parent;
     } else {
-      directory = (await getApplicationSupportDirectory());
+      directory = await getApplicationSupportDirectory();
     }
     await directory.create(recursive: true);
     if (_path == null || !_path!.endsWith('.db')) {
@@ -204,8 +204,8 @@ class CacheObjectProvider extends CacheInfoRepository
   }
 
   // Migration for pre-V2 path on iOS and macOS
-  Future _migrateOldDbPath(String newDbPath) async {
-    final oldDbPath = join((await getDatabasesPath()), '$databaseName.db');
+  Future<void> _migrateOldDbPath(String newDbPath) async {
+    final oldDbPath = join(await getDatabasesPath(), '$databaseName.db');
     if (oldDbPath != newDbPath && await File(oldDbPath).exists()) {
       try {
         await File(oldDbPath).rename(newDbPath);
diff --git a/flutter_cache_manager/lib/src/storage/cache_info_repositories/helper_methods.dart b/flutter_cache_manager/lib/src/storage/cache_info_repositories/helper_methods.dart
index 3243e0db..45ef8df0 100644
--- a/flutter_cache_manager/lib/src/storage/cache_info_repositories/helper_methods.dart
+++ b/flutter_cache_manager/lib/src/storage/cache_info_repositories/helper_methods.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 mixin CacheInfoRepositoryHelperMethods on CacheInfoRepository {
-  var openConnections = 0;
+  int openConnections = 0;
   Completer<bool>? openCompleter;
 
   bool shouldOpenOnNewConnection() {
diff --git a/flutter_cache_manager/lib/src/storage/cache_info_repositories/json_cache_info_repository.dart b/flutter_cache_manager/lib/src/storage/cache_info_repositories/json_cache_info_repository.dart
index c4963662..800f4ba1 100644
--- a/flutter_cache_manager/lib/src/storage/cache_info_repositories/json_cache_info_repository.dart
+++ b/flutter_cache_manager/lib/src/storage/cache_info_repositories/json_cache_info_repository.dart
@@ -5,13 +5,12 @@ import 'dart:math';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_cache_manager/src/storage/cache_info_repositories/cache_info_repository.dart';
+import 'package:flutter_cache_manager/src/storage/cache_info_repositories/helper_methods.dart';
 import 'package:flutter_cache_manager/src/storage/cache_object.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 
-import 'cache_info_repository.dart';
-import 'helper_methods.dart';
-
 class JsonCacheInfoRepository extends CacheInfoRepository
     with CacheInfoRepositoryHelperMethods {
   Directory? directory;
@@ -37,7 +36,7 @@ class JsonCacheInfoRepository extends CacheInfoRepository
     if (!shouldOpenOnNewConnection()) {
       return openCompleter!.future;
     }
-    var file = await _getFile();
+    final file = await _getFile();
     await _readFile(file);
     return opened();
   }
@@ -62,9 +61,9 @@ class JsonCacheInfoRepository extends CacheInfoRepository
     if (cacheObject.id != null) {
       throw ArgumentError("Inserted objects shouldn't have an existing id.");
     }
-    var keys = _jsonCache.keys;
-    var lastId = keys.isEmpty ? 0 : keys.reduce(max);
-    var id = lastId + 1;
+    final keys = _jsonCache.keys;
+    final lastId = keys.isEmpty ? 0 : keys.reduce(max);
+    final id = lastId + 1;
 
     cacheObject = cacheObject.copyWith(id: id);
     return _put(cacheObject, setTouchedToNow);
@@ -83,13 +82,13 @@ class JsonCacheInfoRepository extends CacheInfoRepository
   }
 
   @override
-  Future updateOrInsert(CacheObject cacheObject) {
+  Future<dynamic> updateOrInsert(CacheObject cacheObject) {
     return cacheObject.id == null ? insert(cacheObject) : update(cacheObject);
   }
 
   @override
   Future<List<CacheObject>> getObjectsOverCapacity(int capacity) async {
-    var allSorted = _cacheObjects.values.toList()
+    final allSorted = _cacheObjects.values.toList()
       ..sort((c1, c2) => c1.touched!.compareTo(c2.touched!));
     if (allSorted.length <= capacity) return [];
     return allSorted.getRange(0, allSorted.length - capacity).toList();
@@ -97,7 +96,7 @@ class JsonCacheInfoRepository extends CacheInfoRepository
 
   @override
   Future<List<CacheObject>> getOldObjects(Duration maxAge) async {
-    var oldestTimestamp = DateTime.now().subtract(maxAge);
+    final oldestTimestamp = DateTime.now().subtract(maxAge);
     return _cacheObjects.values
         .where(
           (element) => element.touched!.isBefore(oldestTimestamp),
@@ -107,7 +106,7 @@ class JsonCacheInfoRepository extends CacheInfoRepository
 
   @override
   Future<int> delete(int id) async {
-    var cacheObject = _cacheObjects.values.firstWhereOrNull(
+    final cacheObject = _cacheObjects.values.firstWhereOrNull(
       (element) => element.id == id,
     );
     if (cacheObject == null) {
@@ -120,7 +119,7 @@ class JsonCacheInfoRepository extends CacheInfoRepository
   @override
   Future<int> deleteAll(Iterable<int> ids) async {
     var deleted = 0;
-    for (var id in ids) {
+    for (final id in ids) {
       deleted += await delete(id);
     }
     return deleted;
@@ -135,28 +134,29 @@ class JsonCacheInfoRepository extends CacheInfoRepository
     return true;
   }
 
-  Future _readFile(File file) async {
+  Future<void> _readFile(File file) async {
     _cacheObjects.clear();
     _jsonCache.clear();
     if (await file.exists()) {
       try {
-        var jsonString = await file.readAsString();
-        var json = jsonDecode(jsonString) as List<dynamic>;
-        for (var element in json) {
+        final jsonString = await file.readAsString();
+        final json = jsonDecode(jsonString) as List<dynamic>;
+        for (final element in json) {
           if (element is! Map<String, dynamic>) continue;
-          var map = element;
-          var cacheObject = CacheObject.fromMap(map);
+          final map = element;
+          final cacheObject = CacheObject.fromMap(map);
           _jsonCache[cacheObject.id!] = map;
           _cacheObjects[cacheObject.key] = cacheObject;
         }
-      } catch (e, stacktrace) {
+      } on Object catch (e, stacktrace) {
         FlutterError.reportError(FlutterErrorDetails(
           exception: e,
           stack: stacktrace,
           library: 'flutter cache manager',
-          context: ErrorDescription('Thrown when reading the file containing '
-              'cache info. The cached files cannot be used by the cache manager'
-              'anymore.'),
+          context: ErrorDescription(
+            'Thrown when reading the file containing cache info. '
+            'The cached files cannot be used by the cache manager anymore.',
+          ),
         ));
       }
     }
@@ -165,7 +165,7 @@ class JsonCacheInfoRepository extends CacheInfoRepository
   CacheObject _put(CacheObject cacheObject, bool setTouchedToNow) {
     final map = cacheObject.toMap(setTouchedToNow: setTouchedToNow);
     _jsonCache[cacheObject.id!] = map;
-    var updatedCacheObject = CacheObject.fromMap(map);
+    final updatedCacheObject = CacheObject.fromMap(map);
     _cacheObjects[cacheObject.key] = updatedCacheObject;
     _cacheUpdated();
     return updatedCacheObject;
@@ -185,15 +185,15 @@ class JsonCacheInfoRepository extends CacheInfoRepository
   Timer? timer;
   Duration timerDuration = const Duration(seconds: 3);
 
-  Future _saveFile() async {
+  Future<void> _saveFile() async {
     timer?.cancel();
     timer = null;
     await _file!.writeAsString(jsonEncode(_jsonCache.values.toList()));
   }
 
   @override
-  Future deleteDataFile() async {
-    var file = await _getFile();
+  Future<void> deleteDataFile() async {
+    final file = await _getFile();
     if (await file.exists()) {
       await file.delete();
     }
@@ -201,7 +201,7 @@ class JsonCacheInfoRepository extends CacheInfoRepository
 
   @override
   Future<bool> exists() async {
-    var file = await _getFile();
+    final file = await _getFile();
     return file.exists();
   }
 
diff --git a/flutter_cache_manager/lib/src/storage/cache_info_repositories/non_storing_object_provider.dart b/flutter_cache_manager/lib/src/storage/cache_info_repositories/non_storing_object_provider.dart
index a3646da7..92ea41c2 100644
--- a/flutter_cache_manager/lib/src/storage/cache_info_repositories/non_storing_object_provider.dart
+++ b/flutter_cache_manager/lib/src/storage/cache_info_repositories/non_storing_object_provider.dart
@@ -1,7 +1,6 @@
+import 'package:flutter_cache_manager/src/storage/cache_info_repositories/cache_info_repository.dart';
 import 'package:flutter_cache_manager/src/storage/cache_object.dart';
 
-import 'cache_info_repository.dart';
-
 class NonStoringObjectProvider implements CacheInfoRepository {
   @override
   Future<bool> close() async {
@@ -20,7 +19,7 @@ class NonStoringObjectProvider implements CacheInfoRepository {
 
   @override
   Future<CacheObject?> get(String url) {
-    return Future.value(null);
+    return Future.value();
   }
 
   @override
diff --git a/flutter_cache_manager/lib/src/storage/file_system/file_system_io.dart b/flutter_cache_manager/lib/src/storage/file_system/file_system_io.dart
index 860045cd..15ab3901 100644
--- a/flutter_cache_manager/lib/src/storage/file_system/file_system_io.dart
+++ b/flutter_cache_manager/lib/src/storage/file_system/file_system_io.dart
@@ -1,10 +1,9 @@
 import 'package:file/file.dart' hide FileSystem;
 import 'package:file/local.dart';
+import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 
-import 'file_system.dart';
-
 class IOFileSystem implements FileSystem {
   final Future<Directory> _fileDir;
   final String _cacheKey;
@@ -12,18 +11,18 @@ class IOFileSystem implements FileSystem {
   IOFileSystem(this._cacheKey) : _fileDir = createDirectory(_cacheKey);
 
   static Future<Directory> createDirectory(String key) async {
-    var baseDir = await getTemporaryDirectory();
-    var path = p.join(baseDir.path, key);
+    final baseDir = await getTemporaryDirectory();
+    final path = p.join(baseDir.path, key);
 
-    var fs = const LocalFileSystem();
-    var directory = fs.directory((path));
+    const fs = LocalFileSystem();
+    final directory = fs.directory(path);
     await directory.create(recursive: true);
     return directory;
   }
 
   @override
   Future<File> createFile(String name) async {
-    var directory = (await _fileDir);
+    final directory = await _fileDir;
     if (!(await directory.exists())) {
       await createDirectory(_cacheKey);
     }
diff --git a/flutter_cache_manager/lib/src/web/file_service.dart b/flutter_cache_manager/lib/src/web/file_service.dart
index d72330eb..2dcd01d6 100644
--- a/flutter_cache_manager/lib/src/web/file_service.dart
+++ b/flutter_cache_manager/lib/src/web/file_service.dart
@@ -1,8 +1,9 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:clock/clock.dart';
+import 'package:flutter_cache_manager/src/web/mime_converter.dart';
 import 'package:http/http.dart' as http;
-import 'mime_converter.dart';
 
 ///Flutter Cache Manager
 ///Copyright (c) 2019 Rene Floor
@@ -14,6 +15,7 @@ import 'mime_converter.dart';
 /// from other apps or from local storage.
 abstract class FileService {
   int concurrentFetches = 10;
+
   Future<FileServiceResponse> get(String url, {Map<String, String>? headers});
 }
 
@@ -91,10 +93,11 @@ class HttpGetResponse implements FileServiceResponse {
       for (final setting in controlSettings) {
         final sanitizedSetting = setting.trim().toLowerCase();
         if (sanitizedSetting == 'no-cache') {
-          ageDuration = const Duration();
+          ageDuration = Duration.zero;
         }
         if (sanitizedSetting.startsWith('max-age=')) {
-          var validSeconds = int.tryParse(sanitizedSetting.split('=')[1]) ?? 0;
+          final validSeconds =
+              int.tryParse(sanitizedSetting.split('=')[1]) ?? 0;
           if (validSeconds > 0) {
             ageDuration = Duration(seconds: validSeconds);
           }
diff --git a/flutter_cache_manager/lib/src/web/queue_item.dart b/flutter_cache_manager/lib/src/web/queue_item.dart
index 768d5811..ebfdea6b 100644
--- a/flutter_cache_manager/lib/src/web/queue_item.dart
+++ b/flutter_cache_manager/lib/src/web/queue_item.dart
@@ -3,5 +3,5 @@ class QueueItem {
   final String key;
   final Map<String, String>? headers;
 
-  QueueItem(this.url, this.key, this.headers);
+  const QueueItem(this.url, this.key, this.headers);
 }
diff --git a/flutter_cache_manager/lib/src/web/web_helper.dart b/flutter_cache_manager/lib/src/web/web_helper.dart
index e7e0ef37..1b7e53a5 100644
--- a/flutter_cache_manager/lib/src/web/web_helper.dart
+++ b/flutter_cache_manager/lib/src/web/web_helper.dart
@@ -39,12 +39,13 @@ class WebHelper {
     if (subject == null || ignoreMemCache) {
       subject = BehaviorSubject<FileResponse>();
       _memCache[key] = subject;
-      unawaited(_downloadOrAddToQueue(url, key, authHeaders));
+      _downloadOrAddToQueue(url, key, authHeaders);
     }
     return subject.stream;
   }
 
   var concurrentCalls = 0;
+
   Future<void> _downloadOrAddToQueue(
     String url,
     String key,
@@ -59,13 +60,13 @@ class WebHelper {
         'CacheManager: Downloading $url', CacheManagerLogLevel.verbose);
 
     concurrentCalls++;
-    var subject = _memCache[key]!;
+    final subject = _memCache[key]!;
     try {
-      await for (var result
+      await for (final result
           in _updateFile(url, key, authHeaders: authHeaders)) {
         subject.add(result);
       }
-    } catch (e, stackTrace) {
+    } on Object catch (e, stackTrace) {
       subject.addError(e, stackTrace);
     } finally {
       concurrentCalls--;
@@ -77,7 +78,7 @@ class WebHelper {
 
   void _checkQueue() {
     if (_queue.isEmpty) return;
-    var next = _queue.removeFirst();
+    final next = _queue.removeFirst();
     _downloadOrAddToQueue(next.url, next.key, next.headers);
   }
 
@@ -130,7 +131,7 @@ class WebHelper {
     var newCacheObject = _setDataFromHeaders(cacheObject, response);
     if (statusCodesNewFile.contains(response.statusCode)) {
       var savedBytes = 0;
-      await for (var progress in _saveFile(newCacheObject, response)) {
+      await for (final progress in _saveFile(newCacheObject, response)) {
         savedBytes = progress;
         yield DownloadProgress(
             cacheObject.url, response.contentLength, progress);
@@ -138,11 +139,11 @@ class WebHelper {
       newCacheObject = newCacheObject.copyWith(length: savedBytes);
     }
 
-    unawaited(_store.putFile(newCacheObject).then((_) {
+    _store.putFile(newCacheObject).then((_) {
       if (newCacheObject.relativePath != oldCacheObject.relativePath) {
         _removeOldFile(oldCacheObject.relativePath);
       }
-    }));
+    });
 
     final file = await _store.fileSystem.createFile(
       newCacheObject.relativePath,
@@ -163,7 +164,7 @@ class WebHelper {
     if (!statusCodesFileNotChanged.contains(response.statusCode)) {
       if (!filePath.endsWith(fileExtension)) {
         //Delete old file directly when file extension changed
-        unawaited(_removeOldFile(filePath));
+        _removeOldFile(filePath);
       }
       // Store new file on different path
       filePath = '${const Uuid().v1()}$fileExtension';
@@ -176,16 +177,16 @@ class WebHelper {
   }
 
   Stream<int> _saveFile(CacheObject cacheObject, FileServiceResponse response) {
-    var receivedBytesResultController = StreamController<int>();
-    unawaited(_saveFileAndPostUpdates(
+    final receivedBytesResultController = StreamController<int>();
+    _saveFileAndPostUpdates(
       receivedBytesResultController,
       cacheObject,
       response,
-    ));
+    );
     return receivedBytesResultController.stream;
   }
 
-  Future _saveFileAndPostUpdates(
+  Future<void> _saveFileAndPostUpdates(
       StreamController<int> receivedBytesResultController,
       CacheObject cacheObject,
       FileServiceResponse response) async {
@@ -199,7 +200,7 @@ class WebHelper {
         receivedBytesResultController.add(receivedBytes);
         return s;
       }).pipe(sink);
-    } catch (e, stacktrace) {
+    } on Object catch (e, stacktrace) {
       receivedBytesResultController.addError(e, stacktrace);
     }
     await receivedBytesResultController.close();
@@ -217,5 +218,6 @@ class WebHelper {
 class HttpExceptionWithStatus extends HttpException {
   const HttpExceptionWithStatus(this.statusCode, String message, {Uri? uri})
       : super(message, uri: uri);
+
   final int statusCode;
 }
diff --git a/flutter_cache_manager/pubspec.yaml b/flutter_cache_manager/pubspec.yaml
index 124d2745..903d4c94 100644
--- a/flutter_cache_manager/pubspec.yaml
+++ b/flutter_cache_manager/pubspec.yaml
@@ -1,27 +1,29 @@
 name: flutter_cache_manager
 description: Generic cache manager for flutter. Saves web files on the storages of the device and saves the cache info using sqflite.
-version: 3.3.0
-homepage: https://github.com/Baseflow/flutter_cache_manager/tree/master/flutter_cache_manager
-
+version: 3.3.1
+homepage: https://github.com/Baseflow/flutter_cache_manager/tree/develop/flutter_cache_manager
+topics:
+  - cache
+  - cache-manager
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: '>=2.17.0 <4.0.0'
 
 dependencies:
   clock: ^1.1.0
   collection: ^1.15.0
-  file: ">=6.0.0 <7.0.0"
+  file: '>=6.1.4 <8.0.0'
   flutter:
     sdk: flutter
-  http: ^0.13.0
+  http: '>=0.13.0 <2.0.0'
   path: ^1.8.0
   path_provider: ^2.0.0
-  rxdart: ">=0.26.0 <0.28.0"
-  sqflite: ^2.0.0+3
-  uuid: ^3.0.0
+  rxdart: '>=0.26.0 <0.28.0'
+  sqflite: ^2.0.0+4
+  uuid: '>=3.0.0 <5.0.0'
 
 dev_dependencies:
-  build_runner: ^1.11.5
+  build_runner: ^2.0.0
+  flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter
   mockito: ^5.0.0
-  flutter_lints: ^1.0.4
diff --git a/flutter_cache_manager/test/cache_store_test.dart b/flutter_cache_manager/test/cache_store_test.dart
index e209f484..93a8bd7b 100644
--- a/flutter_cache_manager/test/cache_store_test.dart
+++ b/flutter_cache_manager/test/cache_store_test.dart
@@ -5,8 +5,8 @@ import 'package:flutter_cache_manager/src/cache_store.dart';
 import 'package:flutter_cache_manager/src/storage/cache_object.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
-import 'helpers/config_extensions.dart';
 
+import 'helpers/config_extensions.dart';
 import 'helpers/mock_cache_info_repository.dart';
 import 'helpers/test_configuration.dart';
 
diff --git a/flutter_cache_manager/test/helpers/config_extensions.dart b/flutter_cache_manager/test/helpers/config_extensions.dart
index f7beec37..e3d128dd 100644
--- a/flutter_cache_manager/test/helpers/config_extensions.dart
+++ b/flutter_cache_manager/test/helpers/config_extensions.dart
@@ -8,6 +8,7 @@ import 'mock_file_service.dart';
 
 extension ConfigExtensions on Config {
   MockCacheInfoRepository get mockRepo => repo as MockCacheInfoRepository;
+
   MockFileService get mockFileService => fileService as MockFileService;
 
   Future<File> returnsFile(String fileName, {List<int>? data}) async {
diff --git a/flutter_cache_manager/test/helpers/mock_cache_info_repository.dart b/flutter_cache_manager/test/helpers/mock_cache_info_repository.dart
index dc2f2bbc..1033de72 100644
--- a/flutter_cache_manager/test/helpers/mock_cache_info_repository.dart
+++ b/flutter_cache_manager/test/helpers/mock_cache_info_repository.dart
@@ -1,5 +1,6 @@
 import 'package:flutter_cache_manager/src/storage/cache_object.dart';
 import 'package:mockito/mockito.dart';
+
 import '../mock.mocks.dart';
 
 class MockCacheInfoRepository extends MockCacheInfoRepositoryBase {
diff --git a/flutter_cache_manager/test/helpers/mock_cache_store.dart b/flutter_cache_manager/test/helpers/mock_cache_store.dart
index 0195d8a5..5641c45d 100644
--- a/flutter_cache_manager/test/helpers/mock_cache_store.dart
+++ b/flutter_cache_manager/test/helpers/mock_cache_store.dart
@@ -4,6 +4,7 @@ import '../mock.mocks.dart';
 
 class MockCacheStore extends MockCacheStoreBase {
   MockCacheStore._();
+
   factory MockCacheStore() {
     final store = MockCacheStore._();
     when(store.retrieveCacheData(any,
diff --git a/flutter_cache_manager/test/helpers/mock_file_service.dart b/flutter_cache_manager/test/helpers/mock_file_service.dart
index 9ad019cd..39ee0bf2 100644
--- a/flutter_cache_manager/test/helpers/mock_file_service.dart
+++ b/flutter_cache_manager/test/helpers/mock_file_service.dart
@@ -8,6 +8,7 @@ import '../mock.mocks.dart';
 
 class MockFileService extends MockFileServiceBase {
   MockFileService._();
+
   factory MockFileService({bool includeStandardResponse = true}) {
     var fileService = MockFileService._();
     if (includeStandardResponse) {
diff --git a/flutter_cache_manager/test/helpers/test_configuration.dart b/flutter_cache_manager/test/helpers/test_configuration.dart
index 158c6325..151fbd2a 100644
--- a/flutter_cache_manager/test/helpers/test_configuration.dart
+++ b/flutter_cache_manager/test/helpers/test_configuration.dart
@@ -18,6 +18,7 @@ Config createTestConfig() {
 class TestFileSystem extends FileSystem {
   final directoryFuture =
       MemoryFileSystem().systemTempDirectory.createTemp('test');
+
   @override
   Future<File> createFile(String name) async {
     var dir = await directoryFuture;
diff --git a/flutter_cache_manager/test/http_file_fetcher_test.dart b/flutter_cache_manager/test/http_file_fetcher_test.dart
index 3cc7462d..4cdc6d27 100644
--- a/flutter_cache_manager/test/http_file_fetcher_test.dart
+++ b/flutter_cache_manager/test/http_file_fetcher_test.dart
@@ -82,14 +82,14 @@ void main() {
         });
       });
 
-      Future<FileFetcherResponse> _defaultHttpGetter(String url,
+      Future<FileFetcherResponse> defaultHttpGetter(String url,
           {Map<String, String>? headers}) async {
         var httpResponse = await client.get(Uri.parse(url), headers: headers);
         return HttpFileFetcherResponse(httpResponse);
       }
 
       await withClock(Clock.fixed(DateTime.now()), () async {
-        var httpFileFetcher = FileServiceCompat(_defaultHttpGetter);
+        var httpFileFetcher = FileServiceCompat(defaultHttpGetter);
         final now = clock.now();
         final response = await httpFileFetcher.get('http://test.com/image');
 
diff --git a/flutter_cache_manager/test/image_cache_manager_test.dart b/flutter_cache_manager/test/image_cache_manager_test.dart
index 5e6b57e4..f3701d5d 100644
--- a/flutter_cache_manager/test/image_cache_manager_test.dart
+++ b/flutter_cache_manager/test/image_cache_manager_test.dart
@@ -5,20 +5,21 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_test/flutter_test.dart';
+
 import 'cache_manager_test.dart';
 import 'helpers/config_extensions.dart';
-
 import 'helpers/test_configuration.dart';
 
 const fileName = 'test.jpg';
 const fileUrl = 'baseflow.com/test';
 final validTill = DateTime.now().add(const Duration(days: 1));
+
 void main() {
   setUp(WidgetsFlutterBinding.ensureInitialized);
 
   tearDown(() {
-    PaintingBinding.instance?.imageCache?.clear();
-    PaintingBinding.instance?.imageCache?.clearLiveImages();
+    PaintingBinding.instance.imageCache.clear();
+    PaintingBinding.instance.imageCache.clearLiveImages();
   });
 
   group('Test image resizing', () {
diff --git a/flutter_cache_manager/test/mock.dart b/flutter_cache_manager/test/mock.dart
index 3719e19e..d681f5e5 100644
--- a/flutter_cache_manager/test/mock.dart
+++ b/flutter_cache_manager/test/mock.dart
@@ -3,11 +3,14 @@ import 'package:flutter_cache_manager/src/cache_store.dart';
 import 'package:flutter_cache_manager/src/web/web_helper.dart';
 import 'package:mockito/annotations.dart';
 
-@GenerateMocks([], customMocks: [
-  MockSpec<CacheInfoRepository>(as: #MockCacheInfoRepositoryBase),
-  MockSpec<CacheStore>(as: #MockCacheStoreBase),
-  MockSpec<FileService>(as: #MockFileServiceBase),
-  MockSpec<WebHelper>(),
-])
+@GenerateMocks(
+  [],
+  customMocks: [
+    MockSpec<CacheInfoRepository>(as: #MockCacheInfoRepositoryBase),
+    MockSpec<CacheStore>(as: #MockCacheStoreBase),
+    MockSpec<FileService>(as: #MockFileServiceBase),
+    MockSpec<WebHelper>(),
+  ],
+)
 // ignore: unused_element
 void _f() {}
diff --git a/flutter_cache_manager/test/mock.mocks.dart b/flutter_cache_manager/test/mock.mocks.dart
index ea57f65e..65312d65 100644
--- a/flutter_cache_manager/test/mock.mocks.dart
+++ b/flutter_cache_manager/test/mock.mocks.dart
@@ -1,249 +1,463 @@
-// Mocks generated by Mockito 5.0.0-nullsafety.7 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in flutter_cache_manager/test/mock.dart.
 // Do not manually edit this file.
 
-import 'dart:async' as _i7;
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
 
-import 'package:flutter_cache_manager/src/cache_store.dart' as _i8;
-import 'package:flutter_cache_manager/src/result/file_info.dart' as _i4;
-import 'package:flutter_cache_manager/src/result/file_response.dart' as _i10;
-import 'package:flutter_cache_manager/src/storage/cache_info_repositories/cache_info_repository.dart'
-    as _i6;
+import 'package:flutter_cache_manager/flutter_cache_manager.dart' as _i4;
+import 'package:flutter_cache_manager/src/cache_store.dart' as _i6;
 import 'package:flutter_cache_manager/src/storage/cache_object.dart' as _i2;
 import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart'
     as _i3;
-import 'package:flutter_cache_manager/src/web/file_service.dart' as _i5;
-import 'package:flutter_cache_manager/src/web/web_helper.dart' as _i9;
+import 'package:flutter_cache_manager/src/web/web_helper.dart' as _i7;
 import 'package:mockito/mockito.dart' as _i1;
 
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeCacheObject extends _i1.Fake implements _i2.CacheObject {}
-
-class _FakeDuration extends _i1.Fake implements Duration {}
+class _FakeCacheObject_0 extends _i1.SmartFake implements _i2.CacheObject {
+  _FakeCacheObject_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeFileSystem extends _i1.Fake implements _i3.FileSystem {}
+class _FakeDuration_1 extends _i1.SmartFake implements Duration {
+  _FakeDuration_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeDateTime extends _i1.Fake implements DateTime {}
+class _FakeFileSystem_2 extends _i1.SmartFake implements _i3.FileSystem {
+  _FakeFileSystem_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeFileInfo extends _i1.Fake implements _i4.FileInfo {}
+class _FakeDateTime_3 extends _i1.SmartFake implements DateTime {
+  _FakeDateTime_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeFileServiceResponse extends _i1.Fake
-    implements _i5.FileServiceResponse {}
+class _FakeFileServiceResponse_4 extends _i1.SmartFake
+    implements _i4.FileServiceResponse {
+  _FakeFileServiceResponse_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeFileService extends _i1.Fake implements _i5.FileService {}
+class _FakeFileService_5 extends _i1.SmartFake implements _i4.FileService {
+  _FakeFileService_5(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [CacheInfoRepository].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockCacheInfoRepositoryBase extends _i1.Mock
-    implements _i6.CacheInfoRepository {
+    implements _i4.CacheInfoRepository {
   MockCacheInfoRepositoryBase() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i7.Future<bool> exists() =>
-      (super.noSuchMethod(Invocation.method(#exists, []),
-          returnValue: Future.value(false)) as _i7.Future<bool>);
-  @override
-  _i7.Future<bool> open() => (super.noSuchMethod(Invocation.method(#open, []),
-      returnValue: Future.value(false)) as _i7.Future<bool>);
-  @override
-  _i7.Future<dynamic> updateOrInsert(_i2.CacheObject? cacheObject) =>
-      (super.noSuchMethod(Invocation.method(#updateOrInsert, [cacheObject]),
-          returnValue: Future.value(null)) as _i7.Future<dynamic>);
-  @override
-  _i7.Future<_i2.CacheObject> insert(_i2.CacheObject? cacheObject,
-          {bool? setTouchedToNow = true}) =>
+  _i5.Future<bool> exists() => (super.noSuchMethod(
+        Invocation.method(
+          #exists,
+          [],
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<bool> open() => (super.noSuchMethod(
+        Invocation.method(
+          #open,
+          [],
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<dynamic> updateOrInsert(_i2.CacheObject? cacheObject) =>
       (super.noSuchMethod(
-              Invocation.method(
-                  #insert, [cacheObject], {#setTouchedToNow: setTouchedToNow}),
-              returnValue: Future.value(_FakeCacheObject()))
-          as _i7.Future<_i2.CacheObject>);
-  @override
-  _i7.Future<_i2.CacheObject?> get(String? key) =>
-      (super.noSuchMethod(Invocation.method(#get, [key]),
-              returnValue: Future.value(_FakeCacheObject()))
-          as _i7.Future<_i2.CacheObject?>);
-  @override
-  _i7.Future<int> delete(int? id) =>
-      (super.noSuchMethod(Invocation.method(#delete, [id]),
-          returnValue: Future.value(0)) as _i7.Future<int>);
-  @override
-  _i7.Future<int> deleteAll(Iterable<int>? ids) =>
-      (super.noSuchMethod(Invocation.method(#deleteAll, [ids]),
-          returnValue: Future.value(0)) as _i7.Future<int>);
-  @override
-  _i7.Future<int> update(_i2.CacheObject? cacheObject,
-          {bool? setTouchedToNow = true}) =>
+        Invocation.method(
+          #updateOrInsert,
+          [cacheObject],
+        ),
+        returnValue: _i5.Future<dynamic>.value(),
+      ) as _i5.Future<dynamic>);
+  @override
+  _i5.Future<_i2.CacheObject> insert(
+    _i2.CacheObject? cacheObject, {
+    bool? setTouchedToNow = true,
+  }) =>
       (super.noSuchMethod(
+        Invocation.method(
+          #insert,
+          [cacheObject],
+          {#setTouchedToNow: setTouchedToNow},
+        ),
+        returnValue: _i5.Future<_i2.CacheObject>.value(_FakeCacheObject_0(
+          this,
           Invocation.method(
-              #update, [cacheObject], {#setTouchedToNow: setTouchedToNow}),
-          returnValue: Future.value(0)) as _i7.Future<int>);
-  @override
-  _i7.Future<List<_i2.CacheObject>> getAllObjects() =>
-      (super.noSuchMethod(Invocation.method(#getAllObjects, []),
-              returnValue: Future.value(<_i2.CacheObject>[]))
-          as _i7.Future<List<_i2.CacheObject>>);
-  @override
-  _i7.Future<List<_i2.CacheObject>> getObjectsOverCapacity(int? capacity) =>
+            #insert,
+            [cacheObject],
+            {#setTouchedToNow: setTouchedToNow},
+          ),
+        )),
+      ) as _i5.Future<_i2.CacheObject>);
+  @override
+  _i5.Future<_i2.CacheObject?> get(String? key) => (super.noSuchMethod(
+        Invocation.method(
+          #get,
+          [key],
+        ),
+        returnValue: _i5.Future<_i2.CacheObject?>.value(),
+      ) as _i5.Future<_i2.CacheObject?>);
+  @override
+  _i5.Future<int> delete(int? id) => (super.noSuchMethod(
+        Invocation.method(
+          #delete,
+          [id],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<int> deleteAll(Iterable<int>? ids) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteAll,
+          [ids],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<int> update(
+    _i2.CacheObject? cacheObject, {
+    bool? setTouchedToNow = true,
+  }) =>
       (super.noSuchMethod(
-              Invocation.method(#getObjectsOverCapacity, [capacity]),
-              returnValue: Future.value(<_i2.CacheObject>[]))
-          as _i7.Future<List<_i2.CacheObject>>);
-  @override
-  _i7.Future<List<_i2.CacheObject>> getOldObjects(Duration? maxAge) =>
-      (super.noSuchMethod(Invocation.method(#getOldObjects, [maxAge]),
-              returnValue: Future.value(<_i2.CacheObject>[]))
-          as _i7.Future<List<_i2.CacheObject>>);
-  @override
-  _i7.Future<bool> close() => (super.noSuchMethod(Invocation.method(#close, []),
-      returnValue: Future.value(false)) as _i7.Future<bool>);
-  @override
-  _i7.Future<void> deleteDataFile() =>
-      (super.noSuchMethod(Invocation.method(#deleteDataFile, []),
-          returnValue: Future.value(null),
-          returnValueForMissingStub: Future.value()) as _i7.Future<void>);
+        Invocation.method(
+          #update,
+          [cacheObject],
+          {#setTouchedToNow: setTouchedToNow},
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<List<_i2.CacheObject>> getAllObjects() => (super.noSuchMethod(
+        Invocation.method(
+          #getAllObjects,
+          [],
+        ),
+        returnValue:
+            _i5.Future<List<_i2.CacheObject>>.value(<_i2.CacheObject>[]),
+      ) as _i5.Future<List<_i2.CacheObject>>);
+  @override
+  _i5.Future<List<_i2.CacheObject>> getObjectsOverCapacity(int? capacity) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getObjectsOverCapacity,
+          [capacity],
+        ),
+        returnValue:
+            _i5.Future<List<_i2.CacheObject>>.value(<_i2.CacheObject>[]),
+      ) as _i5.Future<List<_i2.CacheObject>>);
+  @override
+  _i5.Future<List<_i2.CacheObject>> getOldObjects(Duration? maxAge) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getOldObjects,
+          [maxAge],
+        ),
+        returnValue:
+            _i5.Future<List<_i2.CacheObject>>.value(<_i2.CacheObject>[]),
+      ) as _i5.Future<List<_i2.CacheObject>>);
+  @override
+  _i5.Future<bool> close() => (super.noSuchMethod(
+        Invocation.method(
+          #close,
+          [],
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<void> deleteDataFile() => (super.noSuchMethod(
+        Invocation.method(
+          #deleteDataFile,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
 }
 
 /// A class which mocks [CacheStore].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockCacheStoreBase extends _i1.Mock implements _i8.CacheStore {
+class MockCacheStoreBase extends _i1.Mock implements _i6.CacheStore {
   MockCacheStoreBase() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  Duration get cleanupRunMinInterval =>
-      (super.noSuchMethod(Invocation.getter(#cleanupRunMinInterval),
-          returnValue: _FakeDuration()) as Duration);
+  Duration get cleanupRunMinInterval => (super.noSuchMethod(
+        Invocation.getter(#cleanupRunMinInterval),
+        returnValue: _FakeDuration_1(
+          this,
+          Invocation.getter(#cleanupRunMinInterval),
+        ),
+      ) as Duration);
   @override
   set cleanupRunMinInterval(Duration? _cleanupRunMinInterval) =>
       super.noSuchMethod(
-          Invocation.setter(#cleanupRunMinInterval, _cleanupRunMinInterval),
-          returnValueForMissingStub: null);
-  @override
-  _i3.FileSystem get fileSystem =>
-      (super.noSuchMethod(Invocation.getter(#fileSystem),
-          returnValue: _FakeFileSystem()) as _i3.FileSystem);
-  @override
-  set fileSystem(_i3.FileSystem? _fileSystem) =>
-      super.noSuchMethod(Invocation.setter(#fileSystem, _fileSystem),
-          returnValueForMissingStub: null);
-  @override
-  DateTime get lastCleanupRun =>
-      (super.noSuchMethod(Invocation.getter(#lastCleanupRun),
-          returnValue: _FakeDateTime()) as DateTime);
-  @override
-  set lastCleanupRun(DateTime? _lastCleanupRun) =>
-      super.noSuchMethod(Invocation.setter(#lastCleanupRun, _lastCleanupRun),
-          returnValueForMissingStub: null);
-  @override
-  String get storeKey =>
-      (super.noSuchMethod(Invocation.getter(#storeKey), returnValue: '')
-          as String);
-  @override
-  _i7.Future<_i4.FileInfo?> getFile(String? key,
-          {bool? ignoreMemCache = false}) =>
+        Invocation.setter(
+          #cleanupRunMinInterval,
+          _cleanupRunMinInterval,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i3.FileSystem get fileSystem => (super.noSuchMethod(
+        Invocation.getter(#fileSystem),
+        returnValue: _FakeFileSystem_2(
+          this,
+          Invocation.getter(#fileSystem),
+        ),
+      ) as _i3.FileSystem);
+  @override
+  set fileSystem(_i3.FileSystem? _fileSystem) => super.noSuchMethod(
+        Invocation.setter(
+          #fileSystem,
+          _fileSystem,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  DateTime get lastCleanupRun => (super.noSuchMethod(
+        Invocation.getter(#lastCleanupRun),
+        returnValue: _FakeDateTime_3(
+          this,
+          Invocation.getter(#lastCleanupRun),
+        ),
+      ) as DateTime);
+  @override
+  set lastCleanupRun(DateTime? _lastCleanupRun) => super.noSuchMethod(
+        Invocation.setter(
+          #lastCleanupRun,
+          _lastCleanupRun,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get storeKey => (super.noSuchMethod(
+        Invocation.getter(#storeKey),
+        returnValue: '',
+      ) as String);
+  @override
+  _i5.Future<_i4.FileInfo?> getFile(
+    String? key, {
+    bool? ignoreMemCache = false,
+  }) =>
       (super.noSuchMethod(
-          Invocation.method(#getFile, [key], {#ignoreMemCache: ignoreMemCache}),
-          returnValue:
-              Future.value(_FakeFileInfo())) as _i7.Future<_i4.FileInfo?>);
-  @override
-  _i7.Future<void> putFile(_i2.CacheObject? cacheObject) =>
-      (super.noSuchMethod(Invocation.method(#putFile, [cacheObject]),
-          returnValue: Future.value(null),
-          returnValueForMissingStub: Future.value()) as _i7.Future<void>);
-  @override
-  _i7.Future<_i2.CacheObject?> retrieveCacheData(String? key,
-          {bool? ignoreMemCache = false}) =>
+        Invocation.method(
+          #getFile,
+          [key],
+          {#ignoreMemCache: ignoreMemCache},
+        ),
+        returnValue: _i5.Future<_i4.FileInfo?>.value(),
+      ) as _i5.Future<_i4.FileInfo?>);
+  @override
+  _i5.Future<void> putFile(_i2.CacheObject? cacheObject) => (super.noSuchMethod(
+        Invocation.method(
+          #putFile,
+          [cacheObject],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<_i2.CacheObject?> retrieveCacheData(
+    String? key, {
+    bool? ignoreMemCache = false,
+  }) =>
       (super.noSuchMethod(
-              Invocation.method(
-                  #retrieveCacheData, [key], {#ignoreMemCache: ignoreMemCache}),
-              returnValue: Future.value(_FakeCacheObject()))
-          as _i7.Future<_i2.CacheObject?>);
-  @override
-  _i7.Future<_i4.FileInfo?> getFileFromMemory(String? key) =>
-      (super.noSuchMethod(Invocation.method(#getFileFromMemory, [key]),
-              returnValue: Future.value(_FakeFileInfo()))
-          as _i7.Future<_i4.FileInfo?>);
-  @override
-  _i7.Future<void> emptyCache() =>
-      (super.noSuchMethod(Invocation.method(#emptyCache, []),
-          returnValue: Future.value(null),
-          returnValueForMissingStub: Future.value()) as _i7.Future<void>);
-  @override
-  _i7.Future<void> removeCachedFile(_i2.CacheObject? cacheObject) =>
-      (super.noSuchMethod(Invocation.method(#removeCachedFile, [cacheObject]),
-          returnValue: Future.value(null),
-          returnValueForMissingStub: Future.value()) as _i7.Future<void>);
-  @override
-  _i7.Future<void> dispose() =>
-      (super.noSuchMethod(Invocation.method(#dispose, []),
-          returnValue: Future.value(null),
-          returnValueForMissingStub: Future.value()) as _i7.Future<void>);
+        Invocation.method(
+          #retrieveCacheData,
+          [key],
+          {#ignoreMemCache: ignoreMemCache},
+        ),
+        returnValue: _i5.Future<_i2.CacheObject?>.value(),
+      ) as _i5.Future<_i2.CacheObject?>);
+  @override
+  _i5.Future<_i4.FileInfo?> getFileFromMemory(String? key) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFileFromMemory,
+          [key],
+        ),
+        returnValue: _i5.Future<_i4.FileInfo?>.value(),
+      ) as _i5.Future<_i4.FileInfo?>);
+  @override
+  _i5.Future<void> emptyCache() => (super.noSuchMethod(
+        Invocation.method(
+          #emptyCache,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  void emptyMemoryCache() => super.noSuchMethod(
+        Invocation.method(
+          #emptyMemoryCache,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> removeCachedFile(_i2.CacheObject? cacheObject) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #removeCachedFile,
+          [cacheObject],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> dispose() => (super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
 }
 
 /// A class which mocks [FileService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockFileServiceBase extends _i1.Mock implements _i5.FileService {
+class MockFileServiceBase extends _i1.Mock implements _i4.FileService {
   MockFileServiceBase() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  int get concurrentFetches =>
-      (super.noSuchMethod(Invocation.getter(#concurrentFetches), returnValue: 0)
-          as int);
+  int get concurrentFetches => (super.noSuchMethod(
+        Invocation.getter(#concurrentFetches),
+        returnValue: 0,
+      ) as int);
   @override
   set concurrentFetches(int? _concurrentFetches) => super.noSuchMethod(
-      Invocation.setter(#concurrentFetches, _concurrentFetches),
-      returnValueForMissingStub: null);
-  @override
-  _i7.Future<_i5.FileServiceResponse> get(String? url,
-          {Map<String, String>? headers}) =>
-      (super.noSuchMethod(Invocation.method(#get, [url], {#headers: headers}),
-              returnValue: Future.value(_FakeFileServiceResponse()))
-          as _i7.Future<_i5.FileServiceResponse>);
+        Invocation.setter(
+          #concurrentFetches,
+          _concurrentFetches,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<_i4.FileServiceResponse> get(
+    String? url, {
+    Map<String, String>? headers,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #get,
+          [url],
+          {#headers: headers},
+        ),
+        returnValue: _i5.Future<_i4.FileServiceResponse>.value(
+            _FakeFileServiceResponse_4(
+          this,
+          Invocation.method(
+            #get,
+            [url],
+            {#headers: headers},
+          ),
+        )),
+      ) as _i5.Future<_i4.FileServiceResponse>);
 }
 
 /// A class which mocks [WebHelper].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWebHelper extends _i1.Mock implements _i9.WebHelper {
+class MockWebHelper extends _i1.Mock implements _i7.WebHelper {
   MockWebHelper() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i5.FileService get fileFetcher =>
-      (super.noSuchMethod(Invocation.getter(#fileFetcher),
-          returnValue: _FakeFileService()) as _i5.FileService);
-  @override
-  int get concurrentCalls =>
-      (super.noSuchMethod(Invocation.getter(#concurrentCalls), returnValue: 0)
-          as int);
-  @override
-  set concurrentCalls(int? _concurrentCalls) =>
-      super.noSuchMethod(Invocation.setter(#concurrentCalls, _concurrentCalls),
-          returnValueForMissingStub: null);
-  @override
-  _i7.Stream<_i10.FileResponse> downloadFile(String? url,
-          {String? key,
-          Map<String, String>? authHeaders,
-          bool? ignoreMemCache = false}) =>
+  _i4.FileService get fileFetcher => (super.noSuchMethod(
+        Invocation.getter(#fileFetcher),
+        returnValue: _FakeFileService_5(
+          this,
+          Invocation.getter(#fileFetcher),
+        ),
+      ) as _i4.FileService);
+  @override
+  int get concurrentCalls => (super.noSuchMethod(
+        Invocation.getter(#concurrentCalls),
+        returnValue: 0,
+      ) as int);
+  @override
+  set concurrentCalls(int? _concurrentCalls) => super.noSuchMethod(
+        Invocation.setter(
+          #concurrentCalls,
+          _concurrentCalls,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Stream<_i4.FileResponse> downloadFile(
+    String? url, {
+    String? key,
+    Map<String, String>? authHeaders,
+    bool? ignoreMemCache = false,
+  }) =>
       (super.noSuchMethod(
-              Invocation.method(#downloadFile, [
-                url
-              ], {
-                #key: key,
-                #authHeaders: authHeaders,
-                #ignoreMemCache: ignoreMemCache
-              }),
-              returnValue: const Stream<_i10.FileResponse>.empty())
-          as _i7.Stream<_i10.FileResponse>);
+        Invocation.method(
+          #downloadFile,
+          [url],
+          {
+            #key: key,
+            #authHeaders: authHeaders,
+            #ignoreMemCache: ignoreMemCache,
+          },
+        ),
+        returnValue: _i5.Stream<_i4.FileResponse>.empty(),
+      ) as _i5.Stream<_i4.FileResponse>);
 }