diff --git a/plugins/calendar/drivers/caldav/caldav_driver.php b/plugins/calendar/drivers/caldav/caldav_driver.php
index 6e40c5c9..6b749225 100644
--- a/plugins/calendar/drivers/caldav/caldav_driver.php
+++ b/plugins/calendar/drivers/caldav/caldav_driver.php
@@ -269,7 +269,7 @@ class caldav_driver extends kolab_driver
     /**
      * Get the caldav_calendar instance for the given calendar ID
      *
-     * @param string Calendar identifier (encoded imap folder name)
+     * @param string Calendar identifier
      *
      * @return ?caldav_calendar Object nor null if calendar doesn't exist
      */
diff --git a/plugins/libkolab/lib/kolab_storage_dav_cache_event.php b/plugins/libkolab/lib/kolab_storage_dav_cache_event.php
index b6c3a16e..4d4f0363 100644
--- a/plugins/libkolab/lib/kolab_storage_dav_cache_event.php
+++ b/plugins/libkolab/lib/kolab_storage_dav_cache_event.php
@@ -40,7 +40,13 @@ class kolab_storage_dav_cache_event extends kolab_storage_dav_cache
         $sql_data['dtend']   = $this->_convert_datetime($object['end']);
 
         // extend date range for recurring events
-        if (!empty($object['recurrence']) && !empty($object['_formatobj'])) {
+        if (!empty($object['recurrence'])) {
+            if (empty($object['_formatobj'])) {
+                $event_xml = new kolab_format_event();
+                $event_xml->set($object);
+                $object['_formatobj'] = $event_xml;
+            }
+
             $recurrence = new kolab_date_recurrence($object['_formatobj']);
             $dtend = $recurrence->end() ?: new DateTime('now +100 years');
             $sql_data['dtend'] = $this->_convert_datetime($dtend);