Updated cache server setup to work well across multiple runs