Merge #15230 with fixes

@felskrone, this is the lint fixes and changing the default to False on the cache process, please let me know what you think