[UPDATE] more refactoring + switched cached dirs

Switched cache dirs around so it's <env>/<bucket>/<s3 path>/<file>