Merge "fix cache members for single deploy"