refactor add* into separate files
Merge commit '355bb7e'

Conflicts:
	lib/cache.js