More de-coupling, added cache to parser.