To compensate for this change in focal length due to a temperature change, an integrated image sensor and lens assembly includes a shift measurement module to measure a shift between optical elements to which the shift measurement module is coupled. The measured shift between optical elements is used to determine a shift of the focal plane in reference to the image plane. Optical aberration resulting from the shift of the focal plane in reference to the image plane may further be compensated.