Added new caching functionalities and removed some classes for CodeCoverage