Fix caching of combined bitmaps after complex shaping