diff --git a/core/java/src/net/i2p/data/Destination.java b/core/java/src/net/i2p/data/Destination.java
index 5946056b386559bb5b06b6d9f393472b2bfea467..7419e11ed58162f58dcc67f6b35b9a5b6c5bb2de 100644
--- a/core/java/src/net/i2p/data/Destination.java
+++ b/core/java/src/net/i2p/data/Destination.java
@@ -137,10 +137,12 @@ public class Destination extends DataStructureImpl {
                && DataHelper.eq(getPublicKey(), dst.getPublicKey());
     }
     
+    /** the public key has enough randomness in it to use it by itself for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(getCertificate()) + DataHelper.hashCode(getSigningPublicKey())
-               + DataHelper.hashCode(getPublicKey());
+        if (_publicKey == null)
+            return 0;
+        return _publicKey.hashCode();
     }
     
     @Override
diff --git a/core/java/src/net/i2p/data/Hash.java b/core/java/src/net/i2p/data/Hash.java
index 7dcce1ddbe689fd565941c2b1aed5c25c3cf3cc3..a573b6835d210e7925cc481283b7d710dc3324a2 100644
--- a/core/java/src/net/i2p/data/Hash.java
+++ b/core/java/src/net/i2p/data/Hash.java
@@ -147,9 +147,15 @@ public class Hash extends DataStructureImpl {
         return DataHelper.eq(_data, ((Hash) obj)._data);
     }
     
+    /** a Hash is a hash, so just use the first 4 bytes for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(_data);
+        int rv = 0;
+        if (_data != null) {
+            for (int i = 0; i < 4; i++)
+                rv ^= (_data[i] << (i*8));
+        }
+        return rv;
     }
     
     @Override
@@ -267,4 +273,4 @@ public class Hash extends DataStructureImpl {
         }
         _log.debug("Fill check test passed");
     }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java
index 3dcbf97a6addeef00c518c938af5554ddba2c757..4a683c257ddb0af93e9d7f2bdbe48129cc5a7914 100644
--- a/core/java/src/net/i2p/data/LeaseSet.java
+++ b/core/java/src/net/i2p/data/LeaseSet.java
@@ -345,12 +345,12 @@ public class LeaseSet extends DataStructureImpl {
 
     }
     
+    /** the destination has enough randomness in it to use it by itself for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(getEncryptionKey()) +
-        //(int)_version +
-               DataHelper.hashCode(_leases) + DataHelper.hashCode(getSignature())
-               + DataHelper.hashCode(getSigningKey()) + DataHelper.hashCode(getDestination());
+        if (_destination == null)
+            return 0;
+        return _destination.hashCode();
     }
     
     @Override
diff --git a/core/java/src/net/i2p/data/PrivateKey.java b/core/java/src/net/i2p/data/PrivateKey.java
index 7ea047314439b4110ed84960a3e800636331781e..eed7f1eb77fde90a03288cf321121faf3ccd30b3 100644
--- a/core/java/src/net/i2p/data/PrivateKey.java
+++ b/core/java/src/net/i2p/data/PrivateKey.java
@@ -70,9 +70,15 @@ public class PrivateKey extends DataStructureImpl {
         return DataHelper.eq(_data, ((PrivateKey) obj)._data);
     }
     
+    /** the key has enough randomness in it, use the first 4 bytes for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(_data);
+        int rv = 0;
+        if (_data != null) {
+            for (int i = 0; i < 4; i++)
+                rv ^= (_data[i] << (i*8));
+        }
+        return rv;
     }
     
     @Override
@@ -100,4 +106,4 @@ public class PrivateKey extends DataStructureImpl {
         return KeyGenerator.getPublicKey(this);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/PublicKey.java b/core/java/src/net/i2p/data/PublicKey.java
index d653ea9a42dceeac49922e21aaa49bb6aeb29b54..01bca46e5c364bbfbca7ef19098bbe622bf7e496 100644
--- a/core/java/src/net/i2p/data/PublicKey.java
+++ b/core/java/src/net/i2p/data/PublicKey.java
@@ -72,9 +72,15 @@ public class PublicKey extends DataStructureImpl {
         return DataHelper.eq(_data, ((PublicKey) obj)._data);
     }
     
+    /** the key has enough randomness in it, use the first 4 bytes for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(_data);
+        int rv = 0;
+        if (_data != null) {
+            for (int i = 0; i < 4; i++)
+                rv ^= (_data[i] << (i*8));
+        }
+        return rv;
     }
     
     @Override
@@ -94,4 +100,4 @@ public class PublicKey extends DataStructureImpl {
         return buf.toString();
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java
index 393bf9621f903a92edc54166b47e58720c263cb8..f353f7d7396a24900f969bc5a92c5f976be4c77a 100644
--- a/core/java/src/net/i2p/data/RouterAddress.java
+++ b/core/java/src/net/i2p/data/RouterAddress.java
@@ -130,10 +130,10 @@ public class RouterAddress extends DataStructureImpl {
                && DataHelper.eq(getTransportStyle(), addr.getTransportStyle());
     }
     
+    /** the style should be sufficient, for speed */
     @Override
     public int hashCode() {
-        return getCost() + DataHelper.hashCode(getTransportStyle()) + DataHelper.hashCode(getExpiration())
-               + DataHelper.hashCode(getOptions());
+        return DataHelper.hashCode(getTransportStyle());
     }
     
     @Override
@@ -152,4 +152,4 @@ public class RouterAddress extends DataStructureImpl {
         buf.append("]");
         return buf.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/RouterIdentity.java b/core/java/src/net/i2p/data/RouterIdentity.java
index d7375b2903bda35bf121da0e7dc14935dee7a7ae..94f4760c1ae92d48bafa494e5d8e97308752b9da 100644
--- a/core/java/src/net/i2p/data/RouterIdentity.java
+++ b/core/java/src/net/i2p/data/RouterIdentity.java
@@ -101,10 +101,12 @@ public class RouterIdentity extends DataStructureImpl {
                && DataHelper.eq(getPublicKey(), ident.getPublicKey());
     }
     
+    /** the public key has enough randomness in it to use it by itself for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(getCertificate()) + DataHelper.hashCode(getSigningPublicKey())
-               + DataHelper.hashCode(getPublicKey());
+        if (_publicKey == null)
+            return 0;
+        return _publicKey.hashCode();
     }
     
     @Override
@@ -140,4 +142,4 @@ public class RouterIdentity extends DataStructureImpl {
         __calculatedHash = SHA256Generator.getInstance().calculateHash(identBytes);
         return __calculatedHash;
     }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/SessionKey.java b/core/java/src/net/i2p/data/SessionKey.java
index b89bee50511acb714865892d8496a4871d85cedb..1b2ae8a1e018265caec46458d3d1ad1679204b70 100644
--- a/core/java/src/net/i2p/data/SessionKey.java
+++ b/core/java/src/net/i2p/data/SessionKey.java
@@ -76,9 +76,15 @@ public class SessionKey extends DataStructureImpl {
         return DataHelper.eq(_data, ((SessionKey) obj)._data);
     }
     
+    /** the key has enough randomness in it, use the first 4 bytes for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(_data);
+        int rv = 0;
+        if (_data != null) {
+            for (int i = 0; i < 4; i++)
+                rv ^= (_data[i] << (i*8));
+        }
+        return rv;
     }
 
     @Override
@@ -98,4 +104,4 @@ public class SessionKey extends DataStructureImpl {
         buf.append("]");
         return buf.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/Signature.java b/core/java/src/net/i2p/data/Signature.java
index 41a56aacd765788b6fc4068bd7c4a94447c378ed..cb43741c5edd679e58d2da8f762a6afe2ac99a09 100644
--- a/core/java/src/net/i2p/data/Signature.java
+++ b/core/java/src/net/i2p/data/Signature.java
@@ -62,9 +62,15 @@ public class Signature extends DataStructureImpl {
         return DataHelper.eq(_data, ((Signature) obj)._data);
     }
     
+    /** the sig has enough randomness in it, use the first 4 bytes for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(_data);
+        int rv = 0;
+        if (_data != null) {
+            for (int i = 0; i < 4; i++)
+                rv ^= (_data[i] << (i*8));
+        }
+        return rv;
     }
 
     @Override
@@ -83,4 +89,4 @@ public class Signature extends DataStructureImpl {
         buf.append("]");
         return buf.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/SigningPrivateKey.java b/core/java/src/net/i2p/data/SigningPrivateKey.java
index 4a1a99ccb60c098a9df3e1b34b4e048c66ead2b6..1d2e95cb0ac780dcdfae3073344b5276b309dc50 100644
--- a/core/java/src/net/i2p/data/SigningPrivateKey.java
+++ b/core/java/src/net/i2p/data/SigningPrivateKey.java
@@ -68,9 +68,15 @@ public class SigningPrivateKey extends DataStructureImpl {
         return DataHelper.eq(_data, ((SigningPrivateKey) obj)._data);
     }
     
+    /** the key has enough randomness in it, use the first 4 bytes for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(_data);
+        int rv = 0;
+        if (_data != null) {
+            for (int i = 0; i < 4; i++)
+                rv ^= (_data[i] << (i*8));
+        }
+        return rv;
     }
 
     @Override
@@ -96,4 +102,4 @@ public class SigningPrivateKey extends DataStructureImpl {
     public SigningPublicKey toPublic() {
         return KeyGenerator.getSigningPublicKey(this);
     }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/data/SigningPublicKey.java b/core/java/src/net/i2p/data/SigningPublicKey.java
index 09097593f1a4959add8527ccaa4db7310e5f6f10..44b8f3c137cb79e6d66f0065bffef5794f11333a 100644
--- a/core/java/src/net/i2p/data/SigningPublicKey.java
+++ b/core/java/src/net/i2p/data/SigningPublicKey.java
@@ -67,9 +67,15 @@ public class SigningPublicKey extends DataStructureImpl {
         return DataHelper.eq(_data, ((SigningPublicKey) obj)._data);
     }
 
+    /** the key has enough randomness in it, use the first 4 bytes for speed */
     @Override
     public int hashCode() {
-        return DataHelper.hashCode(_data);
+        int rv = 0;
+        if (_data != null) {
+            for (int i = 0; i < 4; i++)
+                rv ^= (_data[i] << (i*8));
+        }
+        return rv;
     }
 
     @Override
@@ -88,4 +94,4 @@ public class SigningPublicKey extends DataStructureImpl {
         buf.append("]");
         return buf.toString();
     }
-}
\ No newline at end of file
+}