Fix on lock and caching issue