fix internal caching