Code cleanliness updates

- Factor out cache busting code
- Make explicit WithLock, WithRLock in function signatures