- added a small offset cache and removed a bug