Added caches and changed graphs to show all data