Feature/fix faketime cache