trying to fix this caching