updated with new utils. fixed cache dir and cleanup.