Fix double caching issue. Tweak graph width/height.