Make the client array / enabled cache compatible with older C++ am: 28a757c91e am: 314b21b97e Change-Id: Ie0ef40dae35b176f944626b39c4013f3733fe1be