2 files changed, 24 insertions, 4 deletions
diff --git a/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/Lazy.java b/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/Lazy.java
index adf531c..ee42a2f 100644
--- a/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/Lazy.java
+++ b/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/Lazy.java
@@ -56,8 +56,10 @@ import javax.inject.Provider;
  * @since 1.2
  */
 public final class Lazy<T> {
+    private static final Object SENTINEL = new Object();
+
     private final Provider<T> provider;
-    private volatile T instance = null;
+    private volatile Object instance = SENTINEL;
 
     @Inject
     Lazy(Provider<T> provider) {
@@ -67,15 +69,16 @@ public final class Lazy<T> {
     /**
      * @return A lazily-produced value of type {@code T}.
      */
+    @SuppressWarnings("unchecked")
     public T get() {
         // Double-checked locking
-        if (instance == null) {
+        if (instance == SENTINEL) {
             synchronized (this) {
-                if (instance == null) {
+                if (instance == SENTINEL) {
                     instance = provider.get();
                 }
             }
         }
-        return instance;
+        return (T) instance;
     }
 }
diff --git a/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/LazyBinder.java b/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/LazyBinder.java
index 26d3848..baad5da 100644
--- a/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/LazyBinder.java
+++ b/sangria-lazy/src/main/java/com/tavianator/sangria/lazy/LazyBinder.java
@@ -269,5 +269,22 @@ public class LazyBinder {
                 return visitor.visit(binding);
             }
         }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == this) {
+                return true;
+            } else if (!(obj instanceof LazyProvider)) {
+                return false;
+            }
+
+            LazyProvider<?> other = (LazyProvider<?>) obj;
+            return key.equals(other.key);
+        }
+
+        @Override
+        public int hashCode() {
+            return key.hashCode();
+        }
     }
 }