diff --git a/lib/widgets/debug/cache.dart b/lib/widgets/debug/cache.dart
index ed37531ac..cc9842fe4 100644
--- a/lib/widgets/debug/cache.dart
+++ b/lib/widgets/debug/cache.dart
@@ -40,12 +40,12 @@ class _DebugCacheSectionState extends State<DebugCacheSection> with AutomaticKee
               Row(
                 children: [
                   Expanded(
-                    child: Text('SVG cache: ${PictureProvider.cacheCount} items'),
+                    child: Text('SVG cache: ${PictureProvider.cache.count} items'),
                   ),
                   SizedBox(width: 8),
                   ElevatedButton(
                     onPressed: () {
-                      PictureProvider.clearCache();
+                      PictureProvider.cache.clear();
 
                       setState(() {});
                     },
diff --git a/pubspec.lock b/pubspec.lock
index 7d9e69197..b69a46116 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "20.0.0"
+    version: "21.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   archive:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   async:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: decorated_icon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   event_bus:
     dependency: "direct main"
     description:
@@ -221,7 +221,7 @@ packages:
       name: firebase_analytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.0.0"
+    version: "8.0.2"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
@@ -242,7 +242,7 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.1.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -263,14 +263,14 @@ packages:
       name: firebase_crashlytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.2"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -312,7 +312,7 @@ packages:
     description:
       path: "."
       ref: "issues/829-nullsafety"
-      resolved-ref: "2ff083d5f57cc372a8b5b46c8d8fe806326a1bcb"
+      resolved-ref: "622d7e894034681c46470a4e4c94964d0ccd6454"
       url: "git://github.com/fleaflet/flutter_map.git"
     source: git
     version: "0.12.0"
@@ -343,7 +343,7 @@ packages:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.21.0+1"
+    version: "0.22.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -554,7 +554,7 @@ packages:
       name: overlay_support
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   package_config:
     dependency: transitive
     description:
@@ -624,14 +624,14 @@ packages:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   pdf:
     dependency: "direct main"
     description:
       name: pdf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.0"
+    version: "3.3.0"
   pedantic:
     dependency: "direct main"
     description:
@@ -652,14 +652,14 @@ packages:
       name: permission_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.3"
+    version: "7.0.0"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.3"
+    version: "3.3.0"
   petitparser:
     dependency: transitive
     description:
@@ -701,7 +701,7 @@ packages:
       name: printing
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.0"
+    version: "5.2.1"
   process:
     dependency: transitive
     description:
@@ -792,7 +792,7 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   shelf_packages_handler:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 247702189..1fa3a49fc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,7 +13,7 @@ environment:
 # bump `crypto` and others - 2021/02/05 https://github.com/flutter/flutter/commit/bc1cf4945841ba5874f5262b8146d52750e7c11f
 # bump `archive` from 3.0.0 to 3.1.2 - 2021/03/04 https://github.com/flutter/flutter/commit/ddcb8d7d6d3fcedc906b2f1bf26b73c018d3dc28
 
-# not null safe, as of 2021/04/16
+# not null safe, as of 2021/04/28
 # `charts_flutter` - https://github.com/google/charts/issues/579
 # `fijkplayer` - https://github.com/befovy/fijkplayer/issues/381
 # `flutter_map` - https://github.com/fleaflet/flutter_map/issues/829
@@ -58,7 +58,8 @@ dependencies:
   overlay_support:
   package_info:
   palette_generator:
-  panorama:
+# TODO TLAD upgrade panorama when this is fixed: https://github.com/zesage/panorama/issues/25 (bug in v0.4.1)
+  panorama: 0.4.0
   pdf:
   pedantic:
   percent_indicator: