fixing caching bug kinda :/