fixed race condition with collapse container cache