Change CairoImporter to work with FileSystem wrapper