correct uriComponent encoding; remove that fileCache bullshit that never really did anything anyway; some code reformatting;