- more SPI removal, for font cache and CFStream