1 files changed, 13 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index 5395fc208b..8e50cce102 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -31,17 +31,24 @@ module ActiveRecord
       end
 
       private
-
-        def target_scope
-          super.limit!(1)
-        end
-
         def scope_for_create
           super.except!(klass.primary_key)
         end
 
         def find_target
-          super.first
+          scope = self.scope
+          return scope.take if skip_statement_cache?(scope)
+
+          conn = klass.connection
+          sc = reflection.association_scope_cache(conn, owner) do |params|
+            as = AssociationScope.create { params.bind }
+            target_scope.merge!(as.scope(self)).limit(1)
+          end
+
+          binds = AssociationScope.get_bind_values(owner, reflection.chain)
+          sc.execute(binds, conn) do |record|
+            set_inverse_instance record
+          end.first
         rescue ::RangeError
           nil
         end