Broke out cache server and working with tests