diff --git a/Session/Shared/ConversationCell.swift b/Session/Shared/ConversationCell.swift
index 46074851b..3b1d8ca6a 100644
--- a/Session/Shared/ConversationCell.swift
+++ b/Session/Shared/ConversationCell.swift
@@ -157,8 +157,7 @@ final class ConversationCell : UITableViewCell {
     // MARK: Updating
     private func update() {
         AssertIsOnMainThread()
-        guard let thread = threadViewModel?.threadRecord, let threadID = thread.uniqueId else { return }
-        MentionsManager.populateUserPublicKeyCacheIfNeeded(for: threadID) // FIXME: This is a terrible place to do this
+        guard let thread = threadViewModel?.threadRecord else { return }
         let isBlocked: Bool
         if let thread = thread as? TSContactThread {
             isBlocked = SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(thread.contactSessionID())
diff --git a/SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift b/SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift
index c1485ad68..b91303954 100644
--- a/SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift	
+++ b/SignalUtilitiesKit/Profile Pictures/ProfilePictureView.swift	
@@ -69,7 +69,7 @@ public final class ProfilePictureView : UIView {
                 publicKey = ""
                 useFallbackPicture = true
             } else { // A closed group
-                var users = MentionsManager.userPublicKeyCache[thread.uniqueId!] ?? []
+                var users = Set(thread.groupModel.groupMemberIds)
                 users.remove(getUserHexEncodedPublicKey())
                 var randomUsers = users.sorted() // Sort to provide a level of stability
                 if users.count == 1 {