Check upload policy less frequently

Fair point but I feel that we already have too many params :-) We can defer this until there is a strong need for this.