Merge pull request #948 from rustyswayne/1.5.0

Braintree caching fixes