Switch to using class variables for indices?

[fedorov]

Until recently, class variables were used for the indices that were fetched at runtime, but not for the main indices, and not for the accompanying index catalog!