And cache for countries and remove some functions with a typo