Merge "Correct caching behavior for should_inject_cache" am: 9afbf2a
am: c52b853

* commit 'c52b853194553dae146bf19b9279b6290fe8c678':
  Correct caching behavior for should_inject_cache