Switched fully to SmartCache