Merge "Automatically reset namespace caches when needed"