Changed caching to S3