Added namespace handling to Cache provider