Some caching, fix for labels in graphs