diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index df15747..7c7a83e 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -30,11 +30,16 @@ jobs:
         run: |
           go install golang.org/x/tools/cmd/goimports@latest
           go install honnef.co/go/tools/cmd/staticcheck@latest
-          go install github.com/beeper/pre-commit-go/bridgelint@latest
           export PATH="$HOME/go/bin:$PATH"
 
+      - name: Cache pre-commit
+        uses: actions/cache@v6
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-go${{ matrix.go-version }}-${{ hashFiles('.pre-commit-config.yaml') }}
+
       - name: Run pre-commit
-        uses: pre-commit/action@v3.0.1
+        run: pipx run pre-commit run --all-files --show-diff-on-failure --color=always
 
   test:
     runs-on: ubuntu-latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1f1fe9c..8ea1c20 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,5 +27,4 @@ repos:
       - id: zerolog-ban-msgf
       - id: zerolog-use-stringer
       - id: bridgelint
-        language: system
         verbose: true
diff --git a/pkg/connector/chatinfo.go b/pkg/connector/chatinfo.go
index dbc524d..4668cd7 100644
--- a/pkg/connector/chatinfo.go
+++ b/pkg/connector/chatinfo.go
@@ -445,15 +445,11 @@ func (s *SignalClient) GetContactList(ctx context.Context) ([]*bridgev2.ResolveI
 	}
 	resp := make([]*bridgev2.ResolveIdentifierResponse, len(recipients))
 	for i, recipient := range recipients {
-		if err = ctx.Err(); err != nil {
-			return nil, err
+		recipientResp := &bridgev2.ResolveIdentifierResponse{
+			Chat: s.makeCreateDMResponse(ctx, recipient, nil),
 		}
-		recipientResp := &bridgev2.ResolveIdentifierResponse{}
 		var username string
 		if recipient.ACI != uuid.Nil {
-			recipientResp.Chat = &bridgev2.CreateChatResponse{
-				PortalKey: s.makeDMPortalKey(libsignalgo.NewACIServiceID(recipient.ACI)),
-			}
 			recipientResp.UserID = signalid.MakeUserID(recipient.ACI)
 			ghost, err := s.Main.Bridge.GetGhostByID(ctx, recipientResp.UserID)
 			if err != nil {
@@ -462,11 +458,7 @@ func (s *SignalClient) GetContactList(ctx context.Context) ([]*bridgev2.ResolveI
 			recipientResp.Ghost = ghost
 			username = ghost.Metadata.(*signalid.GhostMetadata).Username
 		} else {
-			pniServiceID := libsignalgo.NewPNIServiceID(recipient.PNI)
-			recipientResp.Chat = &bridgev2.CreateChatResponse{
-				PortalKey: s.makeDMPortalKey(pniServiceID),
-			}
-			recipientResp.UserID = signalid.MakeUserIDFromServiceID(pniServiceID)
+			recipientResp.UserID = signalid.MakeUserIDFromServiceID(libsignalgo.NewPNIServiceID(recipient.PNI))
 		}
 		recipientResp.UserInfo, err = s.contactToUserInfo(ctx, recipient, username, false)
 		if err != nil {