TYRUS-228: Client SPI refactoring