Updated tests, added cache location hook.