Mappers to use CacheTrait to reduce code duplication