Added lock level caching