Merge pull request #8280 from duglin/Issue3636

Add more info about when build cache is invalidated/used - Issue #3636