Added caching of relation classes for combined relationship types