Add static function to clear the internal resolvers cache, fix some issues.