"the agent doesn't seem to retain context" How did you get this impression? Could it be that it still does?