Re-added uniform location caching.