Use default ContentFileObject #162 - credit to cwood

This excludes the portion of #162 that implements the caching. Caching is under discussion in #161