Hotfix/parse caching

Integrated fix to caching mechanism