fix parsing, chache entityes