Code feedback. Removed the test class and replaced it with a module wide cache fixture.