Reworked VhostCache and improved servlet shutdown