Fixes to caching of base offset.