Fix busted caching, update Gem locks