Use modern syntax in a few places.
Add a method to clear the SVG cache.
Merge branch 'master' into arc