diff --git a/src/server/Cache.hs b/src/server/Cache.hs
index dc1eebdba..85c84df36 100644
--- a/src/server/Cache.hs
+++ b/src/server/Cache.hs
@@ -12,14 +12,14 @@ import Data.Time (UTCTime,getCurrentTime,diffUTCTime)
 --import Data.Time.Compat (toUTCTime)
 
 data Cache a = Cache {
-      cacheLoad :: FilePath -> IO a,
+      cacheLoad :: Maybe a -> FilePath -> IO a,
       cacheObjects :: MVar (Map FilePath (MVar (Maybe (FileInfo a))))
     }
 
 type FileInfo a = (UTCTime,UTCTime,a) -- modification time, access time, contents
 
 -- | Create a new cache that uses the given function to read and parse files
-newCache :: (FilePath -> IO a) -> IO (Cache a)
+newCache :: (Maybe a -> FilePath -> IO a) -> IO (Cache a)
 newCache load = 
     do objs <- newMVar Map.empty
        return $ Cache { cacheLoad = load, cacheObjects = objs }
@@ -66,6 +66,7 @@ readCache' c file =
     readObject m = do t' <- {-toUTCTime `fmap`-} getModificationTime file
                       now <- getCurrentTime
                       x' <- case m of
-                              Just (t,_,x) | t' == t -> return x
-                              _                      -> cacheLoad c file
+                              Just (t,_,x) | t' == t   -> return x
+                                           | otherwise -> cacheLoad c (Just x) file
+                              _                        -> cacheLoad c Nothing  file
                       return (Just (t',now,x'), (t',x'))
diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index ed2fadf38..19af95bf8 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -4,6 +4,7 @@ module PGFService(cgiMain,cgiMain',getPath,
                   Caches,pgfCache,newPGFCache,flushPGFCache,listPGFCache) where
 
 import PGF2
+import PGF2.Transactions
 import GF.Text.Lexing
 import Cache
 import CGIUtils(outputJSONP,outputPlain,outputHTML,outputText,
@@ -60,16 +61,18 @@ data Caches = Caches { qsem :: QSem,
 newPGFCache jobs = do let n = maybe 4 id jobs
                       qsem <- newQSem n
                       pgfCache <- newCache' readGrammar
-                      lblCache <- newCache' (fmap getDepLabels . readFile)
+                      lblCache <- newCache' (const (fmap getDepLabels . readFile))
                       return $ Caches qsem pgfCache lblCache
 flushPGFCache c = do flushCache (pgfCache c)
                      flushCache (labelsCache c)
 listPGFCache c = listCache (pgfCache c)
 
-readGrammar path =
+readGrammar mb_pgf path =
   case takeExtension path of
     ".pgf" -> readPGF path
-    ".ngf" -> readNGF path
+    ".ngf" -> case mb_pgf of
+                Nothing -> readNGF path
+                Just gr -> putStrLn "CHECKOUT!!!" >> checkoutPGF gr
     _      -> error "Extension must be .pgf or .ngf"
 
 newCache' rd = do c <- newCache rd