Get rid of a stray brace from the rebase
Reorder cache table calculation so that it creates the cache tables before it tries to use them

Redoing 6a886324ba1a88dddd8033770d47055fd9e06ae1 after a rebase
We don't need Scotland. Sorry mates!
Fix something I broke in the rebase at 7dafe9c0