Merge branch 'nd/const-struct-cache-entry'