Merge pull request #3934 from sigurdm/cherry_pick_cache_warning

Cherry pick cache warning