diff --git a/relayapi/relayapi.go b/relayapi/relayapi.go
index 875a84007..c677436dd 100644
--- a/relayapi/relayapi.go
+++ b/relayapi/relayapi.go
@@ -56,7 +56,7 @@ func NewRelayInternalAPI(
 	keyRing *gomatrixserverlib.KeyRing,
 	producer *producers.SyncAPIProducer,
 	relayingEnabled bool,
-	caches *caching.Caches,
+	caches caching.FederationCache,
 ) api.RelayInternalAPI {
 	cfg := &base.Cfg.RelayAPI
 	relayDB, err := storage.NewDatabase(base, &cfg.Database, caches, base.Cfg.Global.IsLocalServerName)
diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go
index f132b2d8a..83928a006 100644
--- a/roomserver/roomserver.go
+++ b/roomserver/roomserver.go
@@ -27,7 +27,7 @@ import (
 // NewInternalAPI returns a concrete implementation of the internal API.
 func NewInternalAPI(
 	base *base.BaseDendrite,
-	caches *caching.Caches,
+	caches caching.RoomServerCaches,
 ) api.RoomserverInternalAPI {
 	cfg := &base.Cfg.RoomServer
 
diff --git a/syncapi/syncapi.go b/syncapi/syncapi.go
index afc54e5d0..7ef28365e 100644
--- a/syncapi/syncapi.go
+++ b/syncapi/syncapi.go
@@ -42,7 +42,7 @@ func AddPublicRoutes(
 	base *base.BaseDendrite,
 	userAPI userapi.SyncUserAPI,
 	rsAPI api.SyncRoomserverAPI,
-	caches *caching.Caches,
+	caches caching.LazyLoadCache,
 ) {
 	cfg := &base.Cfg.SyncAPI