diff --git a/packages/agent-sdk/src/evm/index.ts b/packages/agent-sdk/src/evm/index.ts
index 87dcf2d..16d89f5 100644
--- a/packages/agent-sdk/src/evm/index.ts
+++ b/packages/agent-sdk/src/evm/index.ts
@@ -82,7 +82,7 @@ export async function validateRequest<
   return null;
 }
 
-async function getAdapterAddress(
+export async function getAdapterAddress(
   accountId: string,
   safeSaltNonce: string,
 ): Promise<Address> {
diff --git a/packages/agent-sdk/src/evm/tokens.ts b/packages/agent-sdk/src/evm/tokens.ts
index f1c7c63..87b1c74 100644
--- a/packages/agent-sdk/src/evm/tokens.ts
+++ b/packages/agent-sdk/src/evm/tokens.ts
@@ -35,15 +35,15 @@ export async function getTokenDetails(
   symbolOrAddress: string,
   tokenMap?: BlockchainMapping,
 ): Promise<TokenInfo> {
+  if (isAddress(symbolOrAddress, { strict: false })) {
+    return getTokenInfo(chainId, symbolOrAddress);
+  }
   if (!tokenMap) {
     console.log(
       "Loading TokenMap... this should be stored in memory consider setting it with loadTokenMap() in your app and passing it here.",
     );
     tokenMap = await loadTokenMap();
   }
-  if (isAddress(symbolOrAddress, { strict: false })) {
-    return getTokenInfo(chainId, symbolOrAddress);
-  }
   console.log("Seeking TokenMap for Symbol", symbolOrAddress);
   // TokenMap has lower cased (sanitized) symbols
   return tokenMap[chainId][symbolOrAddress.toLowerCase()];