Make the client array / enabled cache compatible with older C++

Change-Id: I48c74eae3f26bf1a94fdc03a3966ef802407d7e4
2 files changed