Fetch to update after tarball
Tidyup cache-server logic