Fixed generic parse cache architecture problems