Fix problem where cached user objects would not update when default user options...

Fix problem where cached user objects would not update when default user options were changed. Now, only the option *overrides* are stored in the cache, and the options themselves are built from the defaults + overrides per request.