Improved options to avoid caching