diff --git a/atproto/identity/cache_directory.go b/atproto/identity/cache_directory.go
index de4dad7d..9ffebb1b 100644
--- a/atproto/identity/cache_directory.go
+++ b/atproto/identity/cache_directory.go
@@ -37,8 +37,8 @@ type identityEntry struct {
 var _ Directory = (*CacheDirectory)(nil)
 
 // Capacity of zero means unlimited size. Similarly, ttl of zero means unlimited duration.
-func NewCacheDirectory(inner Directory, capacity int, hitTTL, errTTL, invalidHandleTTL time.Duration) CacheDirectory {
-	return CacheDirectory{
+func NewCacheDirectory(inner Directory, capacity int, hitTTL, errTTL, invalidHandleTTL time.Duration) *CacheDirectory {
+	return &CacheDirectory{
 		ErrTTL:           errTTL,
 		InvalidHandleTTL: invalidHandleTTL,
 		Inner:            inner,
diff --git a/atproto/identity/directory.go b/atproto/identity/directory.go
index c67d16a2..20dd0fbb 100644
--- a/atproto/identity/directory.go
+++ b/atproto/identity/directory.go
@@ -85,6 +85,5 @@ func DefaultDirectory() Directory {
 		SkipDNSDomainSuffixes: []string{".bsky.social"},
 		UserAgent:             "indigo-identity/" + versioninfo.Short(),
 	}
-	cached := NewCacheDirectory(&base, 250_000, time.Hour*24, time.Minute*2, time.Minute*5)
-	return &cached
+	return NewCacheDirectory(&base, 250_000, time.Hour*24, time.Minute*2, time.Minute*5)
 }
diff --git a/atproto/identity/live_test.go b/atproto/identity/live_test.go
index c763bf09..589cd3db 100644
--- a/atproto/identity/live_test.go
+++ b/atproto/identity/live_test.go
@@ -66,7 +66,7 @@ func TestCacheDirectory(t *testing.T) {
 	inner := BaseDirectory{}
 	d := NewCacheDirectory(&inner, 1000, time.Hour*1, time.Hour*1, time.Hour*1)
 	for i := 0; i < 3; i = i + 1 {
-		testDirectoryLive(t, &d)
+		testDirectoryLive(t, d)
 	}
 }
 
diff --git a/cmd/hepa/main.go b/cmd/hepa/main.go
index 9fa1ee62..73948c22 100644
--- a/cmd/hepa/main.go
+++ b/cmd/hepa/main.go
@@ -12,9 +12,10 @@ import (
 	"strings"
 	"time"
 
-	_ "github.com/joho/godotenv/autoload"
 	_ "net/http/pprof"
 
+	_ "github.com/joho/godotenv/autoload"
+
 	"github.com/bluesky-social/indigo/atproto/identity"
 	"github.com/bluesky-social/indigo/atproto/identity/redisdir"
 	"github.com/bluesky-social/indigo/atproto/syntax"
@@ -222,8 +223,7 @@ func configDirectory(cmd *cli.Command) (identity.Directory, error) {
 		}
 		dir = rdir
 	} else {
-		cdir := identity.NewCacheDirectory(&baseDir, 1_500_000, time.Hour*24, time.Minute*2, time.Minute*5)
-		dir = &cdir
+		dir = identity.NewCacheDirectory(&baseDir, 1_500_000, time.Hour*24, time.Minute*2, time.Minute*5)
 	}
 	return dir, nil
 }
diff --git a/cmd/palomar/main.go b/cmd/palomar/main.go
index d48ef5cc..556cb3a9 100644
--- a/cmd/palomar/main.go
+++ b/cmd/palomar/main.go
@@ -267,7 +267,7 @@ var runCmd = &cli.Command{
 			PostIndex:    cmd.String("es-post-index"),
 		}
 
-		srv, err := search.NewServer(escli, &dir, apiConfig)
+		srv, err := search.NewServer(escli, dir, apiConfig)
 		if err != nil {
 			return err
 		}
@@ -290,7 +290,7 @@ var runCmd = &cli.Command{
 				IndexingRateLimit:   cmd.Int("indexing-rate-limit"),
 			}
 
-			idx, err := search.NewIndexer(db, escli, &dir, indexerConfig)
+			idx, err := search.NewIndexer(db, escli, dir, indexerConfig)
 			if err != nil {
 				return fmt.Errorf("failed to set up indexer: %w", err)
 			}
diff --git a/cmd/relay/main.go b/cmd/relay/main.go
index 9ff35a07..2f74b773 100644
--- a/cmd/relay/main.go
+++ b/cmd/relay/main.go
@@ -278,7 +278,7 @@ func runRelay(ctx context.Context, cmd *cli.Command) error {
 	evtman := eventmgr.NewEventManager(persister)
 
 	logger.Info("constructing relay service")
-	r, err := relay.NewRelay(db, evtman, &dir, relayConfig)
+	r, err := relay.NewRelay(db, evtman, dir, relayConfig)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/tap/tap.go b/cmd/tap/tap.go
index 0c39cf8f..6079b265 100644
--- a/cmd/tap/tap.go
+++ b/cmd/tap/tap.go
@@ -70,7 +70,7 @@ func NewTap(config TapConfig) (*Tap, error) {
 
 	evtMngr := NewEventManager(logger, db, &config)
 
-	repoMngr := NewRepoManager(logger, db, evtMngr, &cdir)
+	repoMngr := NewRepoManager(logger, db, evtMngr, cdir)
 
 	resyncer := NewResyncer(logger, db, repoMngr, evtMngr, &config)
 
@@ -80,7 +80,7 @@ func NewTap(config TapConfig) (*Tap, error) {
 
 	outbox := NewOutbox(logger, evtMngr, &config)
 
-	server := NewTapServer(logger, db, outbox, &cdir, firehose, crawler, &config)
+	server := NewTapServer(logger, db, outbox, cdir, firehose, crawler, &config)
 
 	t := &Tap{
 		db:     db,