Or any other common interface to handle the changes between DbContext and ObjectContext, we currently have an generic class that can take a TContext : ObjectContext but adding support for DbContext would mean creating an extra seperate generic class.
The easiest way would be that ObjectContext also implemented the interface and just returned itself.