Added caching for major controllers