Better default setting value logic
Fix template value caching

Refs #1704