Add thread-lock to cache to prevent race-condition(s).

Add thread-lock to cache to prevent race-condition(s). #621