ISPN-3388 Support Legacy cache stores