Enhance cache setting for better demo performance