Cache persistor refactored.