I was expecting a smarter way instead of iteration… something like we have for the views, so a weakmap or something. Is this a temporary fix or not?