Added resolver cache and removed extensive debug logging