Merge pull request #450 from nsendetzky/master

Clears the manager/controller factory caches to avoid side effects