more work on the cache-stuff