Resolved as part of the Search 6 proof of concept groundwork.

The chosen solution was not to replace classes with some generic type, but rather to move APIs relying on a Class<?> to a specific mapper module (the POJO mapper) and expect them to deal with indexes internally.