ISPN-3705 Update the ChannelProvider against the changes introduced in ISPN-3697
Fix failing tests which refer to the now missing FileCacheStore