Added cache downloader to Client, cleaned up Server