minor caching related fixes