added cacheUsers, fixed file names