diff --git a/lib/auth/statichostuser/service.go b/lib/auth/statichostuser/service.go
index 28a88c587a310..e216a21f5a74b 100644
--- a/lib/auth/statichostuser/service.go
+++ b/lib/auth/statichostuser/service.go
@@ -73,6 +73,7 @@ func (s *Service) ListStaticHostUsers(ctx context.Context, req *userprovisioning
 		return nil, trace.Wrap(err)
 	}
 
+	// TODO(atburke): Switch to using the cache after static host users have been added to the cache.
 	users, nextToken, err := s.backend.ListStaticHostUsers(ctx, int(req.PageSize), req.PageToken)
 	if err != nil {
 		return nil, trace.Wrap(err)
@@ -99,6 +100,7 @@ func (s *Service) GetStaticHostUser(ctx context.Context, req *userprovisioningpb
 		return nil, trace.Wrap(err)
 	}
 
+	// TODO(atburke): Switch to using the cache after static host users have been added to the cache.
 	out, err := s.backend.GetStaticHostUser(ctx, req.Name)
 	return out, trace.Wrap(err)
 }
diff --git a/lib/services/local/statichostuser.go b/lib/services/local/statichostuser.go
index 25bf95a2eaca7..cd8ebdad96e0b 100644
--- a/lib/services/local/statichostuser.go
+++ b/lib/services/local/statichostuser.go
@@ -58,7 +58,6 @@ func NewStaticHostUserService(bk backend.Backend) (*StaticHostUserService, error
 
 // ListStaticHostUsers lists static host users.
 func (s *StaticHostUserService) ListStaticHostUsers(ctx context.Context, pageSize int, pageToken string) ([]*userprovisioningpb.StaticHostUser, string, error) {
-	// TODO(atburke): use cache
 	out, nextToken, err := s.svc.ListResources(ctx, pageSize, pageToken)
 	if err != nil {
 		return nil, "", trace.Wrap(err)
@@ -68,7 +67,6 @@ func (s *StaticHostUserService) ListStaticHostUsers(ctx context.Context, pageSiz
 
 // GetStaticHostUser returns a static host user by name.
 func (s *StaticHostUserService) GetStaticHostUser(ctx context.Context, name string) (*userprovisioningpb.StaticHostUser, error) {
-	// TODO(atburke): use cache
 	out, err := s.svc.GetResource(ctx, name)
 	return out, trace.Wrap(err)
 }