Added checking to see if we are using the container class without locking.