diff --git a/flutter_cache_manager_firebase/CHANGELOG.md b/flutter_cache_manager_firebase/CHANGELOG.md
index b8281917..d5480a45 100644
--- a/flutter_cache_manager_firebase/CHANGELOG.md
+++ b/flutter_cache_manager_firebase/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [2.0.0] - 2021-05-28
+* Update to null safety
+
 ## [1.1.0] - 2021-01-14
 * Update Firebase dependency
 
diff --git a/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart b/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart
index 42ed85c9..492f9f02 100644
--- a/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart
+++ b/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart
@@ -7,10 +7,9 @@ import 'firebase_http_file_service.dart';
 class FirebaseCacheManager extends CacheManager {
   static const key = 'firebaseCache';
 
-  static FirebaseCacheManager _instance;
+  static late final FirebaseCacheManager _instance = FirebaseCacheManager._();
 
   factory FirebaseCacheManager() {
-    _instance ??= FirebaseCacheManager._();
     return _instance;
   }
 
diff --git a/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart b/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart
index f761bd25..bc2c9554 100644
--- a/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart
+++ b/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart
@@ -7,9 +7,9 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 class FirebaseHttpFileService extends HttpFileService {
   @override
   Future<FileServiceResponse> get(String url,
-      {Map<String, String> headers = const {}}) async {
+      {Map<String, String>? headers}) async {
     var ref = FirebaseStorage.instance.ref().child(url);
-    var _url = await ref.getDownloadURL() as String;
+    var _url = await ref.getDownloadURL();
 
     return super.get(_url);
   }
diff --git a/flutter_cache_manager_firebase/pubspec.yaml b/flutter_cache_manager_firebase/pubspec.yaml
index 9d226cfb..ac6a8c3b 100644
--- a/flutter_cache_manager_firebase/pubspec.yaml
+++ b/flutter_cache_manager_firebase/pubspec.yaml
@@ -1,18 +1,18 @@
 name: flutter_cache_manager_firebase
 description: CacheManager implementation for firebase_storage. Uses the gs:// as key and translates to https://
-version: 1.1.0
+version: 2.0.0
 homepage: https://github.com/Baseflow/flutter_cache_manager
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_cache_manager: ^2.0.0
-  firebase_storage: ">=3.0.0 <6.0.0"
-  path_provider: "^1.4.0"
-  path: "^1.6.4"
+  flutter_cache_manager: ^3.0.0
+  firebase_storage: ^8.0.0
+  path_provider: ^2.0.0
+  path: ^1.8.0
 
 dev_dependencies:
   flutter_test: