WELD-1766 Differentiate between caching and non-caching client proxies
WELD-1766 Minor adjustments