More aggressive caching
Merge pull request #480 from dswd/fixes

Fixes for 3.2
Merge pull request #481 from dswd/caching

More aggressive caching
Removing uncastable resources
Renamed terms and conditions to acceptable use policy
Fixed type, fixes #484