Fix cached_messages to take self