Added caching to account view