diff --git a/src/c3nav/routing/locator.py b/src/c3nav/routing/locator.py
index 1e786590..272d9291 100644
--- a/src/c3nav/routing/locator.py
+++ b/src/c3nav/routing/locator.py
@@ -146,7 +146,7 @@ class Locator:
         if getattr(cls.cached, 'update', cls.NoUpdate) != update:
             cls.cached.update = update
             cls.cached.data = cls.load_nocache(update)
-        return cls.cached
+        return cls.cached.data
 
     def convert_raw_scan_data(self, raw_scan_data: list[LocateRequestPeerSchema]) -> ScanData:
         return self.convert_scan([d.dict() for d in raw_scan_data], create_peers=False)
diff --git a/src/c3nav/routing/router.py b/src/c3nav/routing/router.py
index e0f5a9de..f535d69a 100644
--- a/src/c3nav/routing/router.py
+++ b/src/c3nav/routing/router.py
@@ -294,7 +294,7 @@ class Router:
         if getattr(cls.cached, 'update', cls.NoUpdate) != update:
             cls.cached.update = update
             cls.cached.data = cls.load_nocache(update)
-        return cls.cached
+        return cls.cached.data
 
     def get_locations(self, location, restrictions):
         locations = ()