Adding account caching and file load support