Ignore the whole cache directory.
Merge branch 'master' into twig

Conflicts:
	.gitignore