Improve deployment functions
Tweak caching