More on the trait-refactor. Simplifying the caching strategies a bit.