diff --git a/src/Solana.Unity.Dex/Orca/Address/AddressUtils.cs b/src/Solana.Unity.Dex/Orca/Address/AddressUtils.cs
index 94194d91..d3f8fcde 100644
--- a/src/Solana.Unity.Dex/Orca/Address/AddressUtils.cs
+++ b/src/Solana.Unity.Dex/Orca/Address/AddressUtils.cs
@@ -20,28 +20,8 @@ public static class AddressUtils
         /// <returns>A Pda (program-derived address) off the curve, or null.</returns>
         public static Pda FindProgramAddress(IEnumerable<byte[]> seeds, PublicKey programId)
         {
-            byte nonce = 255;
-
-            while (nonce != 0)
-            {
-                PublicKey address;
-                List<byte[]> seedsWithNonce = new List<byte[]>(seeds);
-                seedsWithNonce.Add(new byte[] { nonce });
-
-                //try to generate the address 
-                bool created = PublicKey.TryCreateProgramAddress(new List<byte[]>(seedsWithNonce), programId, out address);
-
-                //if succeeded, return 
-                if (created)
-                {
-                    return new Pda(address, nonce);
-                }
-                
-                //decrease the nonce and retry if failed 
-                nonce--;
-            }
-
-            return null;
+            return PublicKey.TryFindProgramAddress(seeds, programId, out PublicKey pubkey, out byte bump) 
+                ? new Pda(pubkey, bump) : null;
         }
 
         /// <summary> 
diff --git a/src/Solana.Unity.Wallet/PublicKey.cs b/src/Solana.Unity.Wallet/PublicKey.cs
index fa249849..92dab57a 100644
--- a/src/Solana.Unity.Wallet/PublicKey.cs
+++ b/src/Solana.Unity.Wallet/PublicKey.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
+using System.Threading;
 
 namespace Solana.Unity.Wallet
 {
@@ -256,7 +257,22 @@ public static bool IsValid(ReadOnlySpan<byte> key, bool validateCurve = false)
         /// <summary>
         /// The bytes of the `ProgramDerivedAddress` string.
         /// </summary>
-        private static readonly byte[] ProgramDerivedAddressBytes = Encoding.UTF8.GetBytes("ProgramDerivedAddress");
+        private static readonly byte[] ProgramDerivedAddressBytes = "ProgramDerivedAddress"u8.ToArray();
+
+        /// <summary>
+        /// A thread-local buffer for all Pda Seeds taht we can reuse
+        /// </summary>
+        private static readonly ThreadLocal<List<byte[]>> PdaSeedsBuffer = new(() => []);
+        
+        /// <summary>
+        /// A thread local buffer for the bump array that we can reuse
+        /// </summary>
+        private static readonly ThreadLocal<byte[]> BumpArray = new(() => new byte[1]);
+        
+        /// <summary>
+        /// A thread local sha256 instance that we can reuse
+        /// </summary>
+        private static readonly ThreadLocal<SHA256> Sha256 = new(SHA256.Create);
 
         /// <summary>
         /// Derives a program address.
@@ -264,36 +280,38 @@ public static bool IsValid(ReadOnlySpan<byte> key, bool validateCurve = false)
         /// <param name="seeds">The address seeds.</param>
         /// <param name="programId">The program Id.</param>
         /// <param name="publicKey">The derived public key, returned as inline out.</param>
-        /// <returns>true if it could derive the program address for the given seeds, otherwise false..</returns>
+        /// <returns>true if it could derive the program address for the given seeds, otherwise false.</returns>
         /// <exception cref="ArgumentException">Throws exception when one of the seeds has an invalid length.</exception>
         public static bool TryCreateProgramAddress(ICollection<byte[]> seeds, PublicKey programId, out PublicKey publicKey)
         {
-            MemoryStream buffer = new(PublicKeyLength * seeds.Count + ProgramDerivedAddressBytes.Length + programId.KeyBytes.Length);
-
+            SHA256 sha256 = Sha256.Value;
+            sha256.Initialize();
+            
             foreach (byte[] seed in seeds)
             {
                 if (seed.Length > PublicKeyLength)
                 {
                     throw new ArgumentException("max seed length exceeded", nameof(seeds));
                 }
-                buffer.Write(seed,0, seed.Length);
+                
+                sha256.TransformBlock(seed,0, seed.Length, null, 0);
             }
 
-            buffer.Write(programId.KeyBytes, 0, programId.KeyBytes.Length);
-            buffer.Write(ProgramDerivedAddressBytes, 0, ProgramDerivedAddressBytes.Length);
-
-            SHA256 sha256 = SHA256.Create();
-            byte[] hash = sha256.ComputeHash(new ReadOnlySpan<byte>(buffer.GetBuffer(), 0, (int)buffer.Length).ToArray());
-
+            sha256.TransformBlock(programId.KeyBytes,0, programId.KeyBytes.Length,  null,0);
+            sha256.TransformBlock(ProgramDerivedAddressBytes, 0, ProgramDerivedAddressBytes.Length, null, 0);
+            sha256.TransformFinalBlock([], 0, 0);
+            
+            byte[] hash = sha256.Hash!;
             if (hash.IsOnCurve())
             {
                 publicKey = null;
                 return false;
             }
-            publicKey = new(hash);
+
+            publicKey = new PublicKey(hash);
             return true;
         }
-
+        
         /// <summary>
         /// Attempts to find a program address for the passed seeds and program Id.
         /// </summary>
@@ -304,28 +322,45 @@ public static bool TryCreateProgramAddress(ICollection<byte[]> seeds, PublicKey
         /// <returns>True whenever the address for a nonce was found, otherwise false.</returns>
         public static bool TryFindProgramAddress(IEnumerable<byte[]> seeds, PublicKey programId, out PublicKey address, out byte bump)
         {
-            byte seedBump = 255;
-            List<byte[]> buffer = seeds.ToList();
-            var bumpArray = new byte[1];
-            buffer.Add(bumpArray);
-
-            while (seedBump != 0)
+            List<byte[]> pdaSeedsBuffer = PdaSeedsBuffer.Value;
+            pdaSeedsBuffer.Clear();
+            pdaSeedsBuffer.AddRange(seeds);
+            
+            if (pdaSeedsBuffer.Any(seed => seed.Length > PublicKeyLength))
             {
-                bumpArray[0] = seedBump;
-                bool success = TryCreateProgramAddress(buffer, programId, out PublicKey derivedAddress);
+                throw new ArgumentException("max seed length exceeded", nameof(seeds));
+            }
+            
+            byte[] bumpArray = BumpArray.Value;
+            SHA256 sha256 = Sha256.Value;
+            
+            for (bump = 255; ; bump--)
+            {
+                sha256.Initialize();
 
-                if (success)
+                foreach (byte[] seed in pdaSeedsBuffer)
+                {
+                    sha256.TransformBlock(seed, 0, seed.Length, null, 0);
+                }
+            
+                bumpArray[0] = bump;
+                sha256.TransformBlock(bumpArray, 0, 1, null, 0);
+                sha256.TransformBlock(programId.KeyBytes, 0, programId.KeyBytes.Length, null, 0);
+                sha256.TransformBlock(ProgramDerivedAddressBytes, 0, ProgramDerivedAddressBytes.Length, null, 0);
+                sha256.TransformFinalBlock([], 0, 0);
+            
+                byte[] hash = sha256.Hash!;
+                if (!hash.IsOnCurve())
                 {
-                    address = derivedAddress;
-                    bump = seedBump;
+                    address = new PublicKey(hash);
                     return true;
                 }
 
-                seedBump--;
+                if (bump == 0) 
+                    break;
             }
 
-            address = null;
-            bump = 0;
+            address = null!;
             return false;
         }