Better caching on tests within controller.