add fix to caching issue and add resend count
Merge branch '1346_newsletter_generator' into bixly-testing