Remove caching as it does not work currently with clustering