Use List for consistent ordering of messages.
Use List for consistent ordering of messages.
Added TODOs where we might want caching.