generalized the caching client for more modules, and fixed some code-style violations