fix lockfiles, improve cache look up for site and git. Previously slower
than just downloading it.