updated for NSCache deadlock bug