Fix bug in cache cleanup.
Merge remote-tracking branch 'origin/fix-0.0.17'

Conflicts:
	CARTOONIST_VERSION