fixing damn caching