Added all cache, added User edit functions