diff --git a/pmb/helpers/args.py b/pmb/helpers/args.py
index 624c45da..29a0b720 100644
--- a/pmb/helpers/args.py
+++ b/pmb/helpers/args.py
@@ -130,15 +130,16 @@ def add_shortcuts(args):
 def add_cache(args):
     """ Add a caching dict (caches parsing of files etc. for the current
         session) """
+    repo_update = {"offline_msg_shown": False}
     setattr(args, "cache", {"apkindex": {},
                             "apkbuild": {},
                             "apk_min_version_checked": [],
                             "apk_repository_list_updated": [],
                             "built": {},
                             "find_aport": {},
-                            "offline_msg_shown": False,
                             "pmb.helpers.package.depends_recurse": {},
-                            "pmb.helpers.package.get": {}})
+                            "pmb.helpers.package.get": {},
+                            "pmb.helpers.repo.update": repo_update})
 
 
 def add_deviceinfo(args):
diff --git a/pmb/helpers/repo.py b/pmb/helpers/repo.py
index d2eb2d85..861a6d6c 100644
--- a/pmb/helpers/repo.py
+++ b/pmb/helpers/repo.py
@@ -120,10 +120,11 @@ def update(args, arch=None, force=False, existing_only=False):
     :returns: True when files have been downloaded, False otherwise
     """
     # Skip in offline mode, only show once
+    cache_key = "pmb.helpers.repo.update"
     if args.offline:
-        if not args.cache["offline_msg_shown"]:
+        if not args.cache[cache_key]["offline_msg_shown"]:
             logging.info("NOTE: skipping package index update (offline mode)")
-        args.cache["offline_msg_shown"] = True
+            args.cache[cache_key]["offline_msg_shown"] = True
         return False
 
     # Architectures and retention time