Change4: Fix references of plugin namespace in cache