Made best cache default
Modified Waypicker to take replacement algorithm as a parameter
Refactored weird variable names