Summary: Cache fields in locals; small javadoc clarifications
Reviewed-by: emcmanus, dholmes, forax, dl