Remove old client classes. Implement new categories clas to enable caching.