Moved Minor*, Cache* into kernel/