Fix building and cartridge controllers, fix tests, re-enable domain caching for now