Updates based on PR Comments

- Remove usage of double check and lock pattern
- Don't cache data only supply a stream
- Remove static method that created attachments