Added extra field validation and cache breaker