Separate upload_original out of download_original
Rename caching to archiving