Add an integer to ensure the unique constraint for countries
Move caching for quotes in the quote repository