OGM-337 Avoiding repeated creation of OptionServiceContext objects by having OptionContext implement OptionServiceContext directly