adjust paths to repo, remove caching hacks