Adding support for discriminatorColumn
Adding lite caching