reflect changes in load-templates.

Also uses options-cache for options.