name-generation and extensions changed

Changed name-generation and extensions of the cached files