more cosmetics
more cleanup in image cache handling