diff --git a/web/account/siwe.react.js b/web/account/siwe.react.js
index c87b7a4f3..939c5d372 100644
--- a/web/account/siwe.react.js
+++ b/web/account/siwe.react.js
@@ -1,202 +1,195 @@
 // @flow
 
 import '@rainbow-me/rainbowkit/dist/index.css';
 
 import {
   ConnectButton,
   darkTheme,
-  getDefaultWallets,
   RainbowKitProvider,
   useConnectModal,
 } from '@rainbow-me/rainbowkit';
 import invariant from 'invariant';
 import _merge from 'lodash/fp/merge';
 import * as React from 'react';
 import { FaEthereum } from 'react-icons/fa';
-import { useAccount, useSigner, WagmiConfig } from 'wagmi';
+import { useAccount, useSigner } from 'wagmi';
 
 import {
   getSIWENonce,
   getSIWENonceActionTypes,
   siweAuth,
   siweAuthActionTypes,
 } from 'lib/actions/siwe-actions';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';
 import type { LogInStartingPayload } from 'lib/types/account-types.js';
 import {
   useDispatchActionPromise,
   useServerCall,
 } from 'lib/utils/action-utils';
 import {
   createSIWEMessage,
   siweMessageSigningExplanationStatements,
   siweStatementWithoutPublicKey,
 } from 'lib/utils/siwe-utils.js';
-import { configureWagmiChains, createWagmiClient } from 'lib/utils/wagmi-utils';
 
 import Button from '../components/button.react';
 import LoadingIndicator from '../loading-indicator.react';
 import { useSelector } from '../redux/redux-utils';
 import { webLogInExtraInfoSelector } from '../selectors/account-selectors.js';
+import { wagmiChains } from '../utils/wagmi-utils';
 import css from './siwe.css';
 
-const { chains, provider } = configureWagmiChains(process.env.COMM_ALCHEMY_KEY);
-const { connectors } = getDefaultWallets({ appName: 'comm', chains });
-const wagmiClient = createWagmiClient({ connectors, provider });
-
 const getSIWENonceLoadingStatusSelector = createLoadingStatusSelector(
   getSIWENonceActionTypes,
 );
 function SIWE(): React.Node {
   const { openConnectModal } = useConnectModal();
   const { address } = useAccount();
   const { data: signer } = useSigner();
   const dispatchActionPromise = useDispatchActionPromise();
   const getSIWENonceCall = useServerCall(getSIWENonce);
   const getSIWENonceCallLoadingStatus = useSelector(
     getSIWENonceLoadingStatusSelector,
   );
   const siweAuthCall = useServerCall(siweAuth);
   const logInExtraInfo = useSelector(webLogInExtraInfoSelector);
 
   const [siweNonce, setSIWENonce] = React.useState<?string>(null);
   const [
     hasSIWEButtonBeenClicked,
     setHasSIWEButtonBeenClicked,
   ] = React.useState<boolean>(false);
 
   const siweNonceShouldBeFetched =
     !siweNonce &&
     getSIWENonceCallLoadingStatus !== 'loading' &&
     (signer || hasSIWEButtonBeenClicked);
 
   React.useEffect(() => {
     if (!siweNonceShouldBeFetched) {
       return;
     }
     dispatchActionPromise(
       getSIWENonceActionTypes,
       (async () => {
         const response = await getSIWENonceCall();
         setSIWENonce(response);
       })(),
     );
   }, [dispatchActionPromise, getSIWENonceCall, siweNonceShouldBeFetched]);
 
   const siweButtonColor = React.useMemo(
     () => ({ backgroundColor: 'white', color: 'black' }),
     [],
   );
 
   const callSIWEAuthEndpoint = React.useCallback(
     (message: string, signature: string, extraInfo) =>
       siweAuthCall({
         message,
         signature,
         ...extraInfo,
       }),
     [siweAuthCall],
   );
 
   const attemptSIWEAuth = React.useCallback(
     (message: string, signature: string) => {
       const extraInfo = logInExtraInfo();
       dispatchActionPromise(
         siweAuthActionTypes,
         callSIWEAuthEndpoint(message, signature, extraInfo),
         undefined,
         ({ calendarQuery: extraInfo.calendarQuery }: LogInStartingPayload),
       );
     },
     [callSIWEAuthEndpoint, dispatchActionPromise, logInExtraInfo],
   );
 
   const onSignInButtonClick = React.useCallback(async () => {
     invariant(siweNonce, 'nonce must be present during SIWE attempt');
     const message = createSIWEMessage(
       address,
       siweStatementWithoutPublicKey,
       siweNonce,
     );
     const signature = await signer.signMessage(message);
     attemptSIWEAuth(message, signature);
   }, [address, attemptSIWEAuth, signer, siweNonce]);
 
   let siweLoginForm;
   if (signer && !siweNonce) {
     siweLoginForm = (
       <div className={css.connectButtonContainer}>
         <LoadingIndicator
           status={getSIWENonceCallLoadingStatus}
           size="medium"
         />
       </div>
     );
   } else if (signer) {
     siweLoginForm = (
       <div className={css.siweLoginFormContainer}>
         <div className={css.connectButtonContainer}>
           <ConnectButton />
         </div>
         <p>{siweMessageSigningExplanationStatements[0]}</p>
         <p>{siweMessageSigningExplanationStatements[1]}</p>
         <Button variant="filled" onClick={onSignInButtonClick}>
           Sign in
         </Button>
       </div>
     );
   }
 
   const onSIWEButtonClick = React.useCallback(() => {
     setHasSIWEButtonBeenClicked(true);
     openConnectModal && openConnectModal();
   }, [openConnectModal]);
 
   let siweButton;
   if (openConnectModal) {
     siweButton = (
       <>
         <Button
           onClick={onSIWEButtonClick}
           variant="filled"
           buttonColor={siweButtonColor}
         >
           <div className={css.ethereumLogoContainer}>
             <FaEthereum />
           </div>
           Sign in with Ethereum
         </Button>
       </>
     );
   }
   return (
     <div className={css.siweContainer}>
       <hr />
       {siweLoginForm}
       {siweButton}
     </div>
   );
 }
 
 function SIWEWrapper(): React.Node {
   const theme = React.useMemo(() => {
     return _merge(darkTheme())({
       radii: {
         modal: 0,
         modalMobile: 0,
       },
       colors: {
         modalBackdrop: '#242529',
       },
     });
   }, []);
   return (
-    <WagmiConfig client={wagmiClient}>
-      <RainbowKitProvider chains={chains} theme={theme} modalSize="compact">
-        <SIWE />
-      </RainbowKitProvider>
-    </WagmiConfig>
+    <RainbowKitProvider chains={wagmiChains} theme={theme} modalSize="compact">
+      <SIWE />
+    </RainbowKitProvider>
   );
 }
 
 export default SIWEWrapper;
diff --git a/web/app.react.js b/web/app.react.js
index 492061c8e..ff1345dae 100644
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -1,314 +1,320 @@
 // @flow
 
 import 'basscss/css/basscss.min.css';
 import './theme.css';
 import { config as faConfig } from '@fortawesome/fontawesome-svg-core';
 import classnames from 'classnames';
 import _isEqual from 'lodash/fp/isEqual';
 import * as React from 'react';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { useDispatch } from 'react-redux';
+import { WagmiConfig } from 'wagmi';
 
 import {
   fetchEntriesActionTypes,
   updateCalendarQueryActionTypes,
 } from 'lib/actions/entry-actions';
 import {
   ModalProvider,
   useModalContext,
 } from 'lib/components/modal-provider.react';
 import {
   createLoadingStatusSelector,
   combineLoadingStatuses,
 } from 'lib/selectors/loading-selectors';
 import { unreadCount } from 'lib/selectors/thread-selectors';
 import { isLoggedIn } from 'lib/selectors/user-selectors';
 import type { LoadingStatus } from 'lib/types/loading-types';
 import type { Dispatch } from 'lib/types/redux-types';
 import { registerConfig } from 'lib/utils/config';
 
 import AppsDirectory from './apps/apps-directory.react';
 import Calendar from './calendar/calendar.react';
 import Chat from './chat/chat.react';
 import { TooltipProvider } from './chat/tooltip-provider';
 import NavigationArrows from './components/navigation-arrows.react';
 import electron from './electron';
 import InputStateContainer from './input/input-state-container.react';
 import LoadingIndicator from './loading-indicator.react';
 import { MenuProvider } from './menu-provider.react';
 import { updateNavInfoActionType } from './redux/action-types';
 import DeviceIDUpdater from './redux/device-id-updater';
 import DisconnectedBar from './redux/disconnected-bar';
 import DisconnectedBarVisibilityHandler from './redux/disconnected-bar-visibility-handler';
 import FocusHandler from './redux/focus-handler.react';
 import PolicyAcknowledgmentHandler from './redux/policy-acknowledgment-handler.js';
 import { useSelector } from './redux/redux-utils';
 import VisibilityHandler from './redux/visibility-handler.react';
 import history from './router-history';
 import AccountSettings from './settings/account-settings.react';
 import DangerZone from './settings/danger-zone.react';
 import LeftLayoutAside from './sidebar/left-layout-aside.react';
 import Splash from './splash/splash.react';
 import './typography.css';
 import css from './style.css';
 import getTitle from './title/getTitle';
 import { type NavInfo } from './types/nav-types';
 import { canonicalURLFromReduxState, navInfoFromURL } from './url-utils';
+import { WagmiENSCacheProvider, wagmiClient } from './utils/wagmi-utils';
 
 // We want Webpack's css-loader and style-loader to handle the Fontawesome CSS,
 // so we disable the autoAddCss logic and import the CSS file. Otherwise every
 // icon flashes huge for a second before the CSS is loaded.
 import '@fortawesome/fontawesome-svg-core/styles.css';
 faConfig.autoAddCss = false;
 
 registerConfig({
   // We can't securely cache credentials on web, so we have no way to recover
   // from a cookie invalidation
   resolveInvalidatedCookie: null,
   // We use httponly cookies on web to protect against XSS attacks, so we have
   // no access to the cookies from JavaScript
   setCookieOnRequest: false,
   setSessionIDOnRequest: true,
   // Never reset the calendar range
   calendarRangeInactivityLimit: null,
   platformDetails: { platform: 'web' },
 });
 
 type BaseProps = {
   +location: {
     +pathname: string,
     ...
   },
 };
 type Props = {
   ...BaseProps,
   // Redux state
   +navInfo: NavInfo,
   +entriesLoadingStatus: LoadingStatus,
   +loggedIn: boolean,
   +activeThreadCurrentlyUnread: boolean,
   // Redux dispatch functions
   +dispatch: Dispatch,
   +modals: $ReadOnlyArray<React.Node>,
 };
 class App extends React.PureComponent<Props> {
   componentDidMount() {
     const {
       navInfo,
       location: { pathname },
       loggedIn,
     } = this.props;
     const newURL = canonicalURLFromReduxState(navInfo, pathname, loggedIn);
     if (pathname !== newURL) {
       history.replace(newURL);
     }
   }
 
   componentDidUpdate(prevProps: Props) {
     const {
       navInfo,
       location: { pathname },
       loggedIn,
     } = this.props;
     if (!_isEqual(navInfo)(prevProps.navInfo)) {
       const newURL = canonicalURLFromReduxState(navInfo, pathname, loggedIn);
       if (newURL !== pathname) {
         history.push(newURL);
       }
     } else if (pathname !== prevProps.location.pathname) {
       const newNavInfo = navInfoFromURL(pathname, { navInfo });
       if (!_isEqual(newNavInfo)(navInfo)) {
         this.props.dispatch({
           type: updateNavInfoActionType,
           payload: newNavInfo,
         });
       }
     } else if (loggedIn !== prevProps.loggedIn) {
       const newURL = canonicalURLFromReduxState(navInfo, pathname, loggedIn);
       if (newURL !== pathname) {
         history.replace(newURL);
       }
     }
     if (loggedIn !== prevProps.loggedIn) {
       electron?.clearHistory();
     }
   }
 
   onWordmarkClicked = () => {
     this.props.dispatch({
       type: updateNavInfoActionType,
       payload: { tab: 'chat' },
     });
   };
 
   render() {
     let content;
     if (this.props.loggedIn) {
       content = this.renderMainContent();
     } else {
       content = <Splash />;
     }
     return (
       <DndProvider backend={HTML5Backend}>
         <TooltipProvider>
           <MenuProvider>
-            <FocusHandler />
-            <VisibilityHandler />
-            <DeviceIDUpdater />
-            <PolicyAcknowledgmentHandler />
-            {content}
-            {this.props.modals}
+            <WagmiConfig client={wagmiClient}>
+              <WagmiENSCacheProvider>
+                <FocusHandler />
+                <VisibilityHandler />
+                <DeviceIDUpdater />
+                <PolicyAcknowledgmentHandler />
+                {content}
+                {this.props.modals}
+              </WagmiENSCacheProvider>
+            </WagmiConfig>
           </MenuProvider>
         </TooltipProvider>
       </DndProvider>
     );
   }
 
   onHeaderDoubleClick = () => electron?.doubleClickTopBar();
   stopDoubleClickPropagation = electron ? e => e.stopPropagation() : null;
 
   renderMainContent() {
     let mainContent;
     const { tab, settingsSection } = this.props.navInfo;
     if (tab === 'calendar') {
       mainContent = <Calendar url={this.props.location.pathname} />;
     } else if (tab === 'chat') {
       mainContent = <Chat />;
     } else if (tab === 'apps') {
       mainContent = <AppsDirectory />;
     } else if (tab === 'settings') {
       if (settingsSection === 'account') {
         mainContent = <AccountSettings />;
       } else if (settingsSection === 'danger-zone') {
         mainContent = <DangerZone />;
       }
     }
 
     let navigationArrows = null;
     if (electron) {
       navigationArrows = <NavigationArrows />;
     }
 
     const headerClasses = classnames({
       [css.header]: true,
       [css['electron-draggable']]: electron,
     });
 
     const wordmarkClasses = classnames({
       [css.wordmark]: true,
       [css['electron-non-draggable']]: electron,
     });
 
     return (
       <div className={css.layout}>
         <DisconnectedBarVisibilityHandler />
         <DisconnectedBar />
         <header
           className={headerClasses}
           onDoubleClick={this.onHeaderDoubleClick}
         >
           <div className={css['main-header']}>
             <h1 className={wordmarkClasses}>
               <a
                 title="Comm Home"
                 aria-label="Go to Comm Home"
                 onClick={this.onWordmarkClicked}
                 onDoubleClick={this.stopDoubleClickPropagation}
               >
                 Comm
               </a>
             </h1>
             {navigationArrows}
             <div className={css['upper-right']}>
               <LoadingIndicator
                 status={this.props.entriesLoadingStatus}
                 size="medium"
                 loadingClassName={css['page-loading']}
                 errorClassName={css['page-error']}
               />
             </div>
           </div>
         </header>
         <InputStateContainer>
           <div className={css['main-content-container']}>
             <div className={css['main-content']}>{mainContent}</div>
           </div>
         </InputStateContainer>
         <LeftLayoutAside />
       </div>
     );
   }
 }
 
 const fetchEntriesLoadingStatusSelector = createLoadingStatusSelector(
   fetchEntriesActionTypes,
 );
 const updateCalendarQueryLoadingStatusSelector = createLoadingStatusSelector(
   updateCalendarQueryActionTypes,
 );
 
 const ConnectedApp: React.ComponentType<BaseProps> = React.memo<BaseProps>(
   function ConnectedApp(props) {
     const activeChatThreadID = useSelector(
       state => state.navInfo.activeChatThreadID,
     );
     const navInfo = useSelector(state => state.navInfo);
 
     const fetchEntriesLoadingStatus = useSelector(
       fetchEntriesLoadingStatusSelector,
     );
     const updateCalendarQueryLoadingStatus = useSelector(
       updateCalendarQueryLoadingStatusSelector,
     );
     const entriesLoadingStatus = combineLoadingStatuses(
       fetchEntriesLoadingStatus,
       updateCalendarQueryLoadingStatus,
     );
 
     const loggedIn = useSelector(isLoggedIn);
     const activeThreadCurrentlyUnread = useSelector(
       state =>
         !activeChatThreadID ||
         !!state.threadStore.threadInfos[activeChatThreadID]?.currentUser.unread,
     );
 
     const boundUnreadCount = useSelector(unreadCount);
     React.useEffect(() => {
       document.title = getTitle(boundUnreadCount);
       electron?.setBadge(boundUnreadCount === 0 ? null : boundUnreadCount);
     }, [boundUnreadCount]);
 
     const dispatch = useDispatch();
     const modalContext = useModalContext();
     const modals = React.useMemo(
       () =>
         modalContext.modals.map(([modal, key]) => (
           <React.Fragment key={key}>{modal}</React.Fragment>
         )),
       [modalContext.modals],
     );
 
     return (
       <App
         {...props}
         navInfo={navInfo}
         entriesLoadingStatus={entriesLoadingStatus}
         loggedIn={loggedIn}
         activeThreadCurrentlyUnread={activeThreadCurrentlyUnread}
         dispatch={dispatch}
         modals={modals}
       />
     );
   },
 );
 
 function AppWithProvider(props: BaseProps): React.Node {
   return (
     <ModalProvider>
       <ConnectedApp {...props} />
     </ModalProvider>
   );
 }
 
 export default AppWithProvider;
diff --git a/web/utils/wagmi-utils.js b/web/utils/wagmi-utils.js
new file mode 100644
index 000000000..464f7fe9e
--- /dev/null
+++ b/web/utils/wagmi-utils.js
@@ -0,0 +1,26 @@
+// @flow
+
+import { getDefaultWallets } from '@rainbow-me/rainbowkit';
+import * as React from 'react';
+import { useProvider } from 'wagmi';
+
+import { ENSCacheProvider } from 'lib/components/ens-cache-provider.react';
+import { configureWagmiChains, createWagmiClient } from 'lib/utils/wagmi-utils';
+
+const { chains, provider } = configureWagmiChains(process.env.COMM_ALCHEMY_KEY);
+const { connectors } = getDefaultWallets({ appName: 'comm', chains });
+const wagmiClient: mixed = createWagmiClient({ connectors, provider });
+const wagmiChains: mixed = chains;
+
+type Props = {
+  +children: React.Node,
+};
+function WagmiENSCacheProvider(props: Props): React.Node {
+  const { children } = props;
+  const wagmiProvider = useProvider();
+  return (
+    <ENSCacheProvider provider={wagmiProvider}>{children}</ENSCacheProvider>
+  );
+}
+
+export { wagmiClient, wagmiChains, WagmiENSCacheProvider };