refactored several additional locks related to ExpiringCache