Make cache folder configurable
Update tests