Merge "Break long lines in includes/cache/"