Added caching back for countries query (probably want to clean up code later)