Merge "Correct caching behavior for should_inject_cache"