ISPN-3290 CacheStore SPI redesign alignment

- Custom and legacy stores currently don't work and code / tests have been adapted for this.