MySQL and Caching clients
Test refactoring after review