Fix weird caching bug on landing