Move to new Repository and centralize cache directory