Interface change. Support cached modules