Redesigned cache and lazy dictionary to be more generic.
Updated schema classes to reflect changes.