Being more aggressive with caching.
This should help quell a warning.
Doc adjustments
Merge branch 'bugfixes-6_3_2' into features-simplified_unsubscriptions