Apply css classes to newly created parent span

It appears that image_caption creates a span around the image. This span should copy the classes from the tag as in cases where the img has classes that impact where it is placed in content this gets lost. Example in my case was using ninesixty grid classes on the image, when the caption was applied this grid formatting gets lost.