CONTENT_CACHING_LAYER supports 'file' or 'content'; added tests