Remove old cachemanager.
Rename new cachemanager modules.
Make tests work again.