Fixing common cache for different trees issue