add changes, remove commented code
fix loading from cache: set empty namespaces temporarily