Add code to ensure that server key is cached