Fix deployment and caching functions