caching and clock fix