Add file caching loader
Class rename