Updated tools to match ems-collector with built-in cache (removed emscached)