Tweaks to respect the useCache property.