More extension work and a cache refactor
update the tests for the latest class changes