Add probe calculation caching back in
Fix a few more float/int bugs where diving by an int was truncating the result