Fix environment clear such that cache is cleared before plugin factories are destroyed

Fix environment clear such that cache is cleared before plugin factories are destroyed #1234