Fixes #46 do not cache next or current