ZSS-846 Support clearClientCache to avoid bloated client in some cases.
Redo ZSS-814