Be a bit smarter about when we cache certain variables
Some doc bumps