More work on the cache-stuff
Some syntax-changes