Fixed parser, caching