Recoded Country States extension to provide more data and cache results, with lookup support