Work in progress on cleaning up the cache module.