Merge pull request #14359 from seamuslee001/fix_cache_key_column