Same concurrency fix for constant cache as in 631edd5.