fix account caching again