Fixed failing tests as a result of moving cached data mapping from repository to controller level.