More work was done to convert the tagged cache class.