Issue #2986187 by das-peter, joseph.olstad: Performance enhancements: locking - cache priming - value injection