Import what we use
Add CacheHandler Test
Make exception message clearer
Convert uses of get_cache to caches where possible