Merge pull request #568 from JWCook/refresh

Revise behavior for refresh, force_refresh, and DO_NOT_CACHE