Cleaning up main caching lib...