Fixed the problem with singleton and cache synchronization issues