Revert "Merge branch 'interpolation-caching' into 'master'"

This reverts merge request !555 (merged)

After running some tests I saw some unexpected behaviour: log likelihoods becoming very large. Reverting and fixing offline.