Update Persistence/Cache with recent SPI changes