fix problems related to caching (maybe)