Enhance cache setting for better demo performance
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop