Merge BigCache branch back