Rails.cache.fetch should respect false as a present value.

activesupport/lib/active_support/cache.rb

@@ -169,12 +169,16 @@ def self.instrument
       #   sleep(6)
       #   cache.fetch("foo")  # => nil
       def fetch(key, options = {}, &block)
-        if !options[:force] && value = read(key, options)
-          value
-        elsif block_given?
+        value = if !options[:force]
+          read(key, options)
+        end
+
+        if value.nil? && block_given?
           result = instrument(:generate, key, options, &block)
           write(key, result, options)
           result
+        else
+          value
         end
       end
 

activesupport/test/caching_test.rb

@@ -101,11 +101,26 @@ def test_should_read_and_write_nil
     assert_equal nil, @cache.read('foo')
   end
 
+  def test_should_read_and_write_false
+    @cache.write('foo', false)
+    assert_equal false, @cache.read('foo')
+  end
+
+  def test_should_read_and_write_true
+    @cache.write('foo', true)
+    assert_equal true, @cache.read('foo')
+  end
+
   def test_fetch_without_cache_miss
     @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.fetch('foo') { 'baz' }
   end
 
+  def test_fetch_false_without_cache_miss
+    @cache.write('foo', false)
+    assert_equal false, @cache.fetch('foo') { 'baz' }
+  end
+
   def test_fetch_with_cache_miss
     assert_equal 'baz', @cache.fetch('foo') { 'baz' }
   end