Spotted an issue with Cache::add() and Cache::remove(). Not sure how to deal with it yet.