diff --git a/gallery.module b/gallery.module
index 4d8812e5f1e8b883c80d6db6ecc75393b8481949..833140a083abb84049aa9f859dc53b68ffd10523 100644
--- a/gallery.module
+++ b/gallery.module
@@ -1,7 +1,9 @@
 <?php
 // $Id$
 
-require_once(drupal_get_path('module', 'gallery') .'/gallery_base.inc');
+if (function_exists('drupal_get_path')){
+  require_once(drupal_get_path('module', 'gallery') .'/gallery_base.inc');
+}
 
 // Default variable values
 define(GALLERY_IMAGEBLOCK_SIZE_METHOD_DEFAULT, 'maxsize');
@@ -437,8 +439,9 @@ function gallery_page() {
  * Implementation of hook_exit().
  */
 function gallery_exit() {
-  if (variable_get('cache', CACHE_DISABLED) != CACHE_DISABLED) {
-    // Drupal page cache is enabled, we need to flush the cache if a G2 item has been updated
+  global $user;
+  // If page cache is enabled we need to flush the cache everytime a G2 item has changed
+  if ($user->uid && variable_get('cache', CACHE_DISABLED) != CACHE_DISABLED) {
     $query = 'SELECT COUNT([GalleryEntity::id]) FROM [GalleryEntity] WHERE [GalleryEntity::modificationTimeStamp] > ?';
   	if (($results = gallery_db_query($query, array(time()-10))) && $results[0]) {
       cache_clear_all();