Reduce code duplication in MessageCache