PLD: remove the caching