Redesigned cache and lazy dictionary.