A little name clean up, and allowing the client to name the cache.