3 files changed, 14 insertions, 4 deletions
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb
index 610f5c0b4a..2a367b85af 100644
--- a/actionview/lib/action_view/helpers/form_helper.rb
+++ b/actionview/lib/action_view/helpers/form_helper.rb
@@ -1038,7 +1038,7 @@ module ActionView
       #   date_field("user", "born_on")
       #   # => <input id="user_born_on" name="user[born_on]" type="date" />
       #
-      # The default value is generated by trying to call "to_date"
+      # The default value is generated by trying to call +strftime+ with "%Y-%m-%d"
       # on the object's value, which makes it behave as expected for instances
       # of DateTime and ActiveSupport::TimeWithZone. You can still override that
       # by passing the "value" option explicitly, e.g.
diff --git a/actionview/lib/action_view/helpers/form_options_helper.rb b/actionview/lib/action_view/helpers/form_options_helper.rb
index f6dd179bb7..430051379d 100644
--- a/actionview/lib/action_view/helpers/form_options_helper.rb
+++ b/actionview/lib/action_view/helpers/form_options_helper.rb
@@ -548,7 +548,7 @@ module ActionView
       end
 
       # Returns a string of option tags for pretty much any time zone in the
-      # world. Supply a ActiveSupport::TimeZone name as +selected+ to have it
+      # world. Supply an ActiveSupport::TimeZone name as +selected+ to have it
       # marked as the selected option tag. You can also supply an array of
       # ActiveSupport::TimeZone objects as +priority_zones+, so that they will
       # be listed above the rest of the (long) list. (You can use
@@ -556,7 +556,7 @@ module ActionView
       # of the US time zones, or a Regexp to select the zones of your choice)
       #
       # The +selected+ parameter must be either +nil+, or a string that names
-      # a ActiveSupport::TimeZone.
+      # an ActiveSupport::TimeZone.
       #
       # By default, +model+ is the ActiveSupport::TimeZone constant (which can
       # be obtained in Active Record as a value object). The only requirement
@@ -655,7 +655,7 @@ module ActionView
       #
       #   params.require(:user).permit(...)
       #
-      # will raise a error since no +{user: ...}+ will be present.
+      # will raise an error since no +{user: ...}+ will be present.
       #
       # To prevent this the helper generates an auxiliary hidden field before
       # every collection of radio buttons. The hidden field has the same name as collection radio button and blank value.
diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index 9c2c9507b7..00fc28a522 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -627,6 +627,16 @@ class CachedCollectionViewRenderTest < CachedViewRenderTest
       @view.render(partial: "test/customer", collection: [customer], cache: ->(item) { [item, 'key'] })
   end
 
+  test "with caching with custom key and rendering with different key" do
+    customer = Customer.new("david")
+    key = cache_key([customer, 'key'], "test/_customer")
+
+    ActionView::PartialRenderer.collection_cache.write(key, 'Hello')
+
+    assert_equal "Hello: david",
+      @view.render(partial: "test/customer", collection: [customer], cache: ->(item) { [item, 'another_key'] })
+  end
+
   test "automatic caching with inferred cache name" do
     customer = CachedCustomer.new("david")
     key = cache_key(customer, "test/_cached_customer")