Merge "Add cache/ to .gitignore"