Fix non-labelcache'd drawing of line and polygon labels (#4837)