fixed datastructure issue, caching every result